Merge pull request #49 from Financial-Times/feature/atlas-migration

Migrated to Atlas and updated kafka version (#48)

Dockerfile

@@ -21,15 +21,9 @@ RUN BUILDINFO_PACKAGE="github.com/Financial-Times/service-status-go/buildinfo."
   && CGO_ENABLED=0 go build -mod=readonly -a -o /artifacts/${PROJECT} -ldflags="${LDFLAGS}" \
   && echo "Build flags: ${LDFLAGS}"
 
-# Download required Amazon certificate to authenticate to the Document DB cluster
-RUN mkdir -p /tmp/amazonaws
-WORKDIR /tmp/amazonaws
-RUN apt-get update && apt-get install -y wget && wget https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem
-
 FROM scratch
 WORKDIR /
 COPY --from=0 /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
 COPY --from=0 /artifacts/* /
-COPY --from=0 /tmp/amazonaws/* /
 
 CMD [ "/content-exporter" ]

README.md

@@ -57,9 +57,9 @@ Options:
     --app-system-code="content-exporter"                              System Code of the application ($APP_SYSTEM_CODE)
     --app-name="content-exporter"                                     Application name ($APP_NAME)
     --port="8080"                                                     Port to listen on ($APP_PORT)
-    --dbAddress=""                                                    DocumentDB Address ($DOCDB_CLUSTER_ADDRESS)
-    --dbUsername=""                                                   DocumentDB Username ($DOCDB_USERNAME)
-    --dbPassword=""                                                   DocumentDB Password ($DOCDB_PASSWORD)
+    --dbAddress=""                                                    MongoDB Address ($DB_CLUSTER_ADDRESS)
+    --dbUsername=""                                                   MongoDB Username ($DB_USERNAME)
+    --dbPassword=""                                                   MongoDB Password ($DB_PASSWORD)
     --enrichedContentAPIURL="http://localhost:8080/enrichedcontent/"  API URL to enriched content endpoint ($ENRICHED_CONTENT_API_URL)
     --enrichedContentHealthURL="http://localhost:8080/__gtg"          Health URL to enriched content endpoint ($ENRICHED_CONTENT_HEALTH_URL)
     --s3WriterAPIURL="http://localhost:8080/content/"                 API URL to S3 writer endpoint ($S3_WRITER_API_URL)

go.mod

@@ -1,57 +1,69 @@
 module github.com/Financial-Times/content-exporter
 
-go 1.18
+go 1.21
 
 require (
 	github.com/Financial-Times/go-fthealth v0.0.0-20170525095041-e7ccca038327
 	github.com/Financial-Times/go-logger/v2 v2.0.1
 	github.com/Financial-Times/http-handlers-go v1.0.0
-	github.com/Financial-Times/kafka-client-go/v3 v3.0.4
-	github.com/Financial-Times/service-status-go v0.0.0-20210115125138-41b7375f9b94
+	github.com/Financial-Times/kafka-client-go/v4 v4.2.2
+	github.com/Financial-Times/service-status-go v0.2.0
 	github.com/Financial-Times/transactionid-utils-go v0.2.0
-	github.com/Financial-Times/upp-go-sdk v1.3.3
-	github.com/google/go-cmp v0.5.7
+	github.com/Financial-Times/upp-go-sdk v1.4.1
+	github.com/google/go-cmp v0.5.8
 	github.com/google/uuid v1.3.0
 	github.com/gorilla/mux v1.8.0
 	github.com/jawher/mow.cli v0.0.0-20170802120632-82aefbee1e23
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475
 	github.com/sethgrid/pester v0.0.0-20160429172022-8053687f9965
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.8.4
 	go.mongodb.org/mongo-driver v1.10.3
 )
 
 require (
-	github.com/Shopify/sarama v1.33.0 // indirect
+	github.com/IBM/sarama v1.40.1 // indirect
+	github.com/aws/aws-sdk-go-v2 v1.17.8 // indirect
+	github.com/aws/aws-sdk-go-v2/config v1.18.11 // indirect
+	github.com/aws/aws-sdk-go-v2/credentials v1.13.11 // indirect
+	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.21 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.27 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.21 // indirect
+	github.com/aws/aws-sdk-go-v2/internal/ini v1.3.28 // indirect
+	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.21 // indirect
+	github.com/aws/aws-sdk-go-v2/service/kafka v1.19.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sso v1.12.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.14.0 // indirect
+	github.com/aws/aws-sdk-go-v2/service/sts v1.18.2 // indirect
+	github.com/aws/smithy-go v1.13.5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/eapache/go-resiliency v1.2.0 // indirect
-	github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 // indirect
+	github.com/eapache/go-resiliency v1.3.0 // indirect
+	github.com/eapache/go-xerial-snappy v0.0.0-20230111030713-bf00bc1b83b6 // indirect
 	github.com/eapache/queue v1.1.0 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
 	github.com/hashicorp/errwrap v1.0.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/hashicorp/go-uuid v1.0.2 // indirect
-	github.com/hashicorp/go-version v1.3.0 // indirect
+	github.com/hashicorp/go-uuid v1.0.3 // indirect
+	github.com/hashicorp/go-version v1.6.0 // indirect
 	github.com/jcmturner/aescts/v2 v2.0.0 // indirect
 	github.com/jcmturner/dnsutils/v2 v2.0.0 // indirect
-	github.com/jcmturner/gofork v1.0.0 // indirect
-	github.com/jcmturner/gokrb5/v8 v8.4.2 // indirect
+	github.com/jcmturner/gofork v1.7.6 // indirect
+	github.com/jcmturner/gokrb5/v8 v8.4.3 // indirect
 	github.com/jcmturner/rpc/v2 v2.0.3 // indirect
-	github.com/klauspost/compress v1.15.0 // indirect
+	github.com/klauspost/compress v1.16.6 // indirect
 	github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe // indirect
-	github.com/pierrec/lz4 v2.6.1+incompatible // indirect
+	github.com/pierrec/lz4/v4 v4.1.17 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/sirupsen/logrus v1.8.1 // indirect
-	github.com/stretchr/objx v0.1.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/xdg-go/pbkdf2 v1.0.0 // indirect
-	github.com/xdg-go/scram v1.1.1 // indirect
-	github.com/xdg-go/stringprep v1.0.3 // indirect
+	github.com/xdg-go/scram v1.1.2 // indirect
+	github.com/xdg-go/stringprep v1.0.4 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
-	golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.5.0 // indirect
-	golang.org/x/text v0.7.0 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	golang.org/x/crypto v0.11.0 // indirect
+	golang.org/x/net v0.12.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/text v0.11.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )