Merge branch 'release/0.20.1'

ONSdigital · Jul 29, 2022 · b69090e · b69090e
2 parents ea6ab58 + eecd3b2
commit b69090e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/config/config.go b/config/config.go
@@ -17,8 +17,8 @@ type Config struct {
 	KafkaOffsetOldest          bool          `envconfig:"KAFKA_OFFSET_OLDEST"`
 	KafkaNumWorkers            int           `envconfig:"KAFKA_NUM_WORKERS"`
 	KafkaSecProtocol           string        `envconfig:"KAFKA_SEC_PROTO"`
-	KafkaSecCACerts            string        `envconfig:"KAFKA_SEC_CA_CERTS"`
-	KafkaSecClientCert         string        `envconfig:"KAFKA_SEC_CLIENT_CERT"`
+	KafkaSecCACerts            string        `envconfig:"KAFKA_SEC_CA_CERTS"            json:"-"`
+	KafkaSecClientCert         string        `envconfig:"KAFKA_SEC_CLIENT_CERT"         json:"-"`
 	KafkaSecClientKey          string        `envconfig:"KAFKA_SEC_CLIENT_KEY"          json:"-"`
 	KafkaSecSkipVerify         bool          `envconfig:"KAFKA_SEC_SKIP_VERIFY"`
 	ContentUpdatedGroup        string        `envconfig:"KAFKA_CONTENT_UPDATED_GROUP"`
@@ -27,7 +27,7 @@ type Config struct {
 	ZebedeeURL                 string        `envconfig:"ZEBEDEE_URL"`
 	KeywordsLimit              int           `envconfig:"KEYWORDS_LIMITS"`
 	DatasetAPIURL              string        `envconfig:"DATASET_API_URL"`
-	ServiceAuthToken           string        `envconfig:"SERVICE_AUTH_TOKEN"`
+	ServiceAuthToken           string        `envconfig:"SERVICE_AUTH_TOKEN"            json:"-"`
 }
 
 var cfg *Config

diff --git a/handler/handler.go b/handler/handler.go
@@ -49,11 +49,6 @@ func (h *ContentPublishedHandler) Handle(ctx context.Context, cpEvent *models.Co
 			return err
 		}
 
-		logData = log.Data{
-			"contentPublished": string(zebedeeContentPublished),
-		}
-		log.Info(ctx, "zebedee response ", logData)
-
 		// byte slice to Json & unMarshall Json
 		var zebedeeData models.ZebedeeData
 		err = json.Unmarshal(zebedeeContentPublished, &zebedeeData)
@@ -68,6 +63,7 @@ func (h *ContentPublishedHandler) Handle(ctx context.Context, cpEvent *models.Co
 			"keywords":      zebedeeData.Description.Keywords,
 			"keywordsLimit": cfg.KeywordsLimit,
 		}
+		log.Info(ctx, "zebedee data ", logData)
 		// Mapping Json to Avro
 		searchData := models.MapZebedeeDataToSearchDataImport(zebedeeData, cfg.KeywordsLimit)
 		searchData.TraceID = cpEvent.TraceID