From 999b9842c84d21f6c53f33117d04ba11907b582c Mon Sep 17 00:00:00 2001 From: "Allison C. Flavia Ruffner" Date: Thu, 29 Jan 2026 13:05:59 -0500 Subject: [PATCH 1/5] Updating parameter to remove Wasabi infrasrtucture. --- cfn/cfn-registry-cluster.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cfn/cfn-registry-cluster.yml b/cfn/cfn-registry-cluster.yml index 96c6de1..7aed0dd 100644 --- a/cfn/cfn-registry-cluster.yml +++ b/cfn/cfn-registry-cluster.yml @@ -292,8 +292,8 @@ Resources: ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER' - Name: RETENTION_MINIMUM_GLACIER_DEEP ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER_DEEP' - - Name: RETENTION_MINIMUM_WASABI - ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_WASABI' + - Name: RETENTION_MINIMUM_NEWSTORAGEOPTION + ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_NEWSTORAGEOPTION' - Name: RETENTION_MINIMUM_STANDARD ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_STANDARD' - Name: AWS_SNS_USER From 958d8e703e9cf81c9d6480d447205eb9783ec5f8 Mon Sep 17 00:00:00 2001 From: Melissa Iori Date: Thu, 29 Jan 2026 13:26:24 -0500 Subject: [PATCH 2/5] Changed WASABI to NEWSTORAGEOPTION for retention minimum parameter --- .env.dev | 2 +- .env.docker | 2 +- .env.integration | 2 +- .env.test | 2 +- .env.travis | 2 +- Dockerfile.multi | 2 +- cfn/cfn-registry-cluster.tmpl | 4 ++-- common/config.go | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.env.dev b/.env.dev index 3f0bf93..6ae5db3 100644 --- a/.env.dev +++ b/.env.dev @@ -146,7 +146,7 @@ REDIS_URL="localhost:6379" # RETENTION_MINIMUM_GLACIER=90 RETENTION_MINIMUM_GLACIER_DEEP=180 -RETENTION_MINIMUM_WASABI=90 +RETENTION_MINIMUM_NEWSTORAGEOPTION=90 RETENTION_MINIMUM_STANDARD=0 # diff --git a/.env.docker b/.env.docker index 12deb36..b525cc6 100644 --- a/.env.docker +++ b/.env.docker @@ -50,7 +50,7 @@ # REDIS_URL # RETENTION_MINIMUM_GLACIER # RETENTION_MINIMUM_GLACIER_DEEP -# RETENTION_MINIMUM_WASABI +# RETENTION_MINIMUM_NEWSTORAGEOPTION # RETENTION_MINIMUM_STANDARD # SESSION_COOKIE_NAME # SESSION_MAX_AGE diff --git a/.env.integration b/.env.integration index f6b9a62..ebde1c7 100644 --- a/.env.integration +++ b/.env.integration @@ -147,7 +147,7 @@ REDIS_URL="localhost:6379" # RETENTION_MINIMUM_GLACIER=90 RETENTION_MINIMUM_GLACIER_DEEP=180 -RETENTION_MINIMUM_WASABI=90 +RETENTION_MINIMUM_NEWSTORAGEOPTION=90 RETENTION_MINIMUM_STANDARD=0 diff --git a/.env.test b/.env.test index 982eea5..7df947b 100644 --- a/.env.test +++ b/.env.test @@ -148,7 +148,7 @@ REDIS_URL="localhost:6379" # RETENTION_MINIMUM_GLACIER=90 RETENTION_MINIMUM_GLACIER_DEEP=180 -RETENTION_MINIMUM_WASABI=90 +RETENTION_MINIMUM_NEWSTORAGEOPTION=90 RETENTION_MINIMUM_STANDARD=0 diff --git a/.env.travis b/.env.travis index 0dd7013..ff5feac 100644 --- a/.env.travis +++ b/.env.travis @@ -147,7 +147,7 @@ REDIS_URL="localhost:6379" # RETENTION_MINIMUM_GLACIER=90 RETENTION_MINIMUM_GLACIER_DEEP=180 -RETENTION_MINIMUM_WASABI=90 +RETENTION_MINIMUM_NEWSTORAGEOPTION=90 RETENTION_MINIMUM_STANDARD=0 # diff --git a/Dockerfile.multi b/Dockerfile.multi index 0eee29e..a077b4e 100644 --- a/Dockerfile.multi +++ b/Dockerfile.multi @@ -93,7 +93,7 @@ ENV AWS_SNS_PWD=password #Storage retention periods. ENV RETENTION_MINIMUM_GLACIER=0 ENV RETENTION_MINIMUM_GLACIER_DEEP=0 -ENV RETENTION_MINIMUM_WASABI=0 +ENV RETENTION_MINIMUM_NEWSTORAGEOPTION=0 ENV RETENTION_MINIMUM_STANDARD=0 # Making a note for a new dockerfile test. EXPOSE 8080 diff --git a/cfn/cfn-registry-cluster.tmpl b/cfn/cfn-registry-cluster.tmpl index 3b7d0d9..24e5d92 100644 --- a/cfn/cfn-registry-cluster.tmpl +++ b/cfn/cfn-registry-cluster.tmpl @@ -292,8 +292,8 @@ Resources: ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER' - Name: RETENTION_MINIMUM_GLACIER_DEEP ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER_DEEP' - - Name: RETENTION_MINIMUM_WASABI - ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_WASABI' + - Name: RETENTION_MINIMUM_NEWSTORAGEOPTION + ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_NEWSTORAGEOPTION' - Name: RETENTION_MINIMUM_STANDARD ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_STANDARD' - Name: AWS_SNS_USER diff --git a/common/config.go b/common/config.go index ccdbb71..a60908f 100644 --- a/common/config.go +++ b/common/config.go @@ -301,7 +301,7 @@ func loadConfig() *Config { RetentionMinimum: &RetentionMinimum{ Glacier: v.GetInt("RETENTION_MINIMUM_GLACIER"), GlacierDeep: v.GetInt("RETENTION_MINIMUM_GLACIER_DEEP"), - Wasabi: v.GetInt("RETENTION_MINIMUM_WASABI"), + Wasabi: v.GetInt("RETENTION_MINIMUM_NEWSTORAGEOPTION"), Standard: v.GetInt("RETENTION_MINIMUM_STANDARD"), }, } From 026039b32c030d0887211bbe462d378a44db82fe Mon Sep 17 00:00:00 2001 From: "Allison C. Flavia Ruffner" Date: Thu, 29 Jan 2026 15:33:16 -0500 Subject: [PATCH 3/5] Adding the new option to registry. --- cfn/cfn-registry-cluster.tmpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cfn/cfn-registry-cluster.tmpl b/cfn/cfn-registry-cluster.tmpl index 3b7d0d9..24e5d92 100644 --- a/cfn/cfn-registry-cluster.tmpl +++ b/cfn/cfn-registry-cluster.tmpl @@ -292,8 +292,8 @@ Resources: ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER' - Name: RETENTION_MINIMUM_GLACIER_DEEP ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_GLACIER_DEEP' - - Name: RETENTION_MINIMUM_WASABI - ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_WASABI' + - Name: RETENTION_MINIMUM_NEWSTORAGEOPTION + ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_NEWSTORAGEOPTION' - Name: RETENTION_MINIMUM_STANDARD ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/RETENTION_MINIMUM_STANDARD' - Name: AWS_SNS_USER From 6506eb0c55b4a1cfba48e8e417a86d57ae3c8fab Mon Sep 17 00:00:00 2001 From: "Allison C. Flavia Ruffner" Date: Wed, 4 Feb 2026 16:56:01 -0500 Subject: [PATCH 4/5] fixing Makfile and latest deployment. --- Makefile | 2 +- cfn/cfn-registry-cluster.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a05c811..5523559 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ publish: registry_login release: build publish ## Make a release by building and publishing the `{version}` as `latest` tagged containers to Gitlab push: ## Push the Docker image up to the registry - docker push $(REGISTRY)/$(REPOSITORY)/$(TAG)-$(BRANCH) + docker push aptrust/$(TAG)-$(BRANCH) update-template: ## Update Cloudformation template with latest container version @echo "Overwriting container revision and branch from the CFN template to the CFN deployment YAML document." diff --git a/cfn/cfn-registry-cluster.yml b/cfn/cfn-registry-cluster.yml index 7aed0dd..533da88 100644 --- a/cfn/cfn-registry-cluster.yml +++ b/cfn/cfn-registry-cluster.yml @@ -200,7 +200,7 @@ Resources: - Condition: SUCCESS ContainerName: Nsqadmin_ResolvConf_InitContainer Essential: true - Image: 997427182289.dkr.ecr.us-east-1.amazonaws.com/docker-hub/aptrust/registry:7ffe11d-master + Image: 997427182289.dkr.ecr.us-east-1.amazonaws.com/docker-hub/aptrust/registry:a27f3c2-wasabi-infra-removal Secrets: - Name: APT_ENV ValueFrom: !Sub 'arn:aws:ssm:us-east-1:997427182289:parameter/${Envn}/REGISTRY/APT_ENV' From 127d33eab2382b5082bb825ff2b00093f8a57f1e Mon Sep 17 00:00:00 2001 From: "Allison C. Flavia Ruffner" Date: Tue, 10 Feb 2026 15:54:33 -0500 Subject: [PATCH 5/5] Returning Makefile to original status for a change in another branch. --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 5523559..a05c811 100644 --- a/Makefile +++ b/Makefile @@ -73,7 +73,7 @@ publish: registry_login release: build publish ## Make a release by building and publishing the `{version}` as `latest` tagged containers to Gitlab push: ## Push the Docker image up to the registry - docker push aptrust/$(TAG)-$(BRANCH) + docker push $(REGISTRY)/$(REPOSITORY)/$(TAG)-$(BRANCH) update-template: ## Update Cloudformation template with latest container version @echo "Overwriting container revision and branch from the CFN template to the CFN deployment YAML document."