From 5882ba34a65324b89f42bd24e44b69a9449f9584 Mon Sep 17 00:00:00 2001 From: Allison Reinheimer Moore Date: Tue, 7 May 2024 14:52:02 -0500 Subject: [PATCH 1/3] DOP-4474: redirects for offline part 1 --- infrastructure/ecs-main/buckets.yml | 130 +++++++++++++++++++++------- 1 file changed, 98 insertions(+), 32 deletions(-) diff --git a/infrastructure/ecs-main/buckets.yml b/infrastructure/ecs-main/buckets.yml index 51a03e74a..047f76740 100644 --- a/infrastructure/ecs-main/buckets.yml +++ b/infrastructure/ecs-main/buckets.yml @@ -25,83 +25,149 @@ Resources: HostName: ${self:custom.site.host.${self:provider.stage}} ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.3 - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.2.1 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.2 RedirectRule: Protocol: "https" HostName: ${self:custom.site.host.${self:provider.stage}} ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.2 - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.2.0 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1 RedirectRule: Protocol: "https" HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.2 + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1 - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1.7 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/php-library/master RedirectRule: Protocol: "https" HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1 + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/php-library/upcoming - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1.6 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/realm/sdk RedirectRule: Protocol: "https" HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1 + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/device-sdks/sdk - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1.5 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/realm/web RedirectRule: Protocol: "https" HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1 + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/device-sdks/web - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1.4 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/realm/studio RedirectRule: Protocol: "https" HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1 + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/device-sdks/studio - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1.3 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v2.9 RedirectRule: Protocol: "https" - HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1 + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1.2 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v2.8 RedirectRule: Protocol: "https" - HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1 + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1.0 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v2.7 RedirectRule: Protocol: "https" - HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/cli/v1.1 + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/php-library/master + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v2.6 RedirectRule: Protocol: "https" - HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/php-library/upcoming + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/realm/sdk + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v2.5 RedirectRule: Protocol: "https" - HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/device-sdks/sdk + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/realm/web + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v2.4 RedirectRule: Protocol: "https" - HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/device-sdks/web + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/realm/studio + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v2.3 RedirectRule: Protocol: "https" - HostName: ${self:custom.site.host.${self:provider.stage}} - ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/atlas/device-sdks/studio + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v2.2 + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v2.1 + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v2.0 + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/v1.1 + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/bi-connector/current + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/kubernetes-operator/v0. + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/kubernetes-operator/stable + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/kubernetes-operator/v1.0 + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/kubernetes-operator/stable + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/kubernetes-operator/v1.1 + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/kubernetes-operator/stable + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/mongocli/v0 + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/mongocli/stable + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/spark-connector/v1.1 + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/spark-connector/current + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/spark-connector/v2 + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/spark-connector/current + - RoutingRuleCondition: + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/spark-connector/v3.0 + RedirectRule: + Protocol: "https" + HostName: ${self.custom.site.host.${self:provider.stage}} + ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/spark-connector/current DocAtlasBucket: Type: "AWS::S3::Bucket" Properties: From 3434435f56fe07103e14c471e127d2184f415537 Mon Sep 17 00:00:00 2001 From: Allison Reinheimer Moore Date: Thu, 16 May 2024 12:36:51 -0400 Subject: [PATCH 2/3] Redirect *all* v1* k8s URLs --- infrastructure/ecs-main/buckets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/ecs-main/buckets.yml b/infrastructure/ecs-main/buckets.yml index 047f76740..295f4dbcf 100644 --- a/infrastructure/ecs-main/buckets.yml +++ b/infrastructure/ecs-main/buckets.yml @@ -139,7 +139,7 @@ Resources: HostName: ${self.custom.site.host.${self:provider.stage}} ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/kubernetes-operator/stable - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/kubernetes-operator/v1.1 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/kubernetes-operator/v1 RedirectRule: Protocol: "https" HostName: ${self.custom.site.host.${self:provider.stage}} From 3d38a9ee96232573b5e68edd3469ad03d282725a Mon Sep 17 00:00:00 2001 From: Allison Reinheimer Moore Date: Thu, 16 May 2024 12:38:03 -0400 Subject: [PATCH 3/3] revision --- infrastructure/ecs-main/buckets.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/infrastructure/ecs-main/buckets.yml b/infrastructure/ecs-main/buckets.yml index 295f4dbcf..1478c80a5 100644 --- a/infrastructure/ecs-main/buckets.yml +++ b/infrastructure/ecs-main/buckets.yml @@ -145,7 +145,7 @@ Resources: HostName: ${self.custom.site.host.${self:provider.stage}} ReplaceKeyPrefixWith: ${self:custom.site.prefix.${self:provider.stage}}/kubernetes-operator/stable - RoutingRuleCondition: - KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/mongocli/v0 + KeyPrefixEquals: ${self:custom.site.prefix.${self:provider.stage}}/mongocli/v0. RedirectRule: Protocol: "https" HostName: ${self.custom.site.host.${self:provider.stage}}