diff --git a/.changeset/friendly-doors-end.md b/.changeset/friendly-doors-end.md new file mode 100644 index 0000000000..8b864ed159 --- /dev/null +++ b/.changeset/friendly-doors-end.md @@ -0,0 +1,6 @@ +--- +'@commercetools-frontend/application-config': minor +'@commercetools-backend/express': minor +--- + +Remove unsupported cloud identifiers diff --git a/packages-backend/express/src/auth.ts b/packages-backend/express/src/auth.ts index 0fd7bbb42e..20ae83bc34 100644 --- a/packages-backend/express/src/auth.ts +++ b/packages-backend/express/src/auth.ts @@ -56,24 +56,17 @@ const mapCloudIdentifierToIssuer = ( ): string | undefined => { switch (issuer) { case CLOUD_IDENTIFIERS.GCP_AU: - return MC_API_URLS.GCP_AU; + return MC_API_URLS[CLOUD_IDENTIFIERS.GCP_AU]; case CLOUD_IDENTIFIERS.GCP_EU: - return MC_API_URLS.GCP_EU; + return MC_API_URLS[CLOUD_IDENTIFIERS.GCP_EU]; case CLOUD_IDENTIFIERS.GCP_US: - return MC_API_URLS.GCP_US; + return MC_API_URLS[CLOUD_IDENTIFIERS.GCP_US]; case CLOUD_IDENTIFIERS.AWS_EU: case CLOUD_IDENTIFIERS.AWS_FRA: - return MC_API_URLS.AWS_EU; + return MC_API_URLS[CLOUD_IDENTIFIERS.AWS_EU]; case CLOUD_IDENTIFIERS.AWS_US: case CLOUD_IDENTIFIERS.AWS_OHIO: - return MC_API_URLS.AWS_US; - // TODO: remove it - case CLOUD_IDENTIFIERS.AWS_CN: - return MC_API_URLS.AWS_CN; - case CLOUD_IDENTIFIERS.AZURE_US: - return MC_API_URLS.AZURE_US; - case CLOUD_IDENTIFIERS.AZURE_EU: - return MC_API_URLS.AZURE_EU; + return MC_API_URLS[CLOUD_IDENTIFIERS.AWS_US]; default: return undefined; } diff --git a/packages-backend/express/src/constants.ts b/packages-backend/express/src/constants.ts index f267eb6bfe..40df0a5254 100644 --- a/packages-backend/express/src/constants.ts +++ b/packages-backend/express/src/constants.ts @@ -12,34 +12,28 @@ export const CLOUD_IDENTIFIERS = { * @deprecated: use `AWS_US` instead */ AWS_OHIO: 'aws-ohio', - /** - * @deprecated: not supported anymore - */ - AWS_CN: 'aws-cn', - AZURE_US: 'azure-us', - AZURE_EU: 'azure-eu', } as const; export const MC_API_URLS = { - GCP_AU: 'https://mc-api.australia-southeast1.gcp.commercetools.com', - GCP_EU: 'https://mc-api.europe-west1.gcp.commercetools.com', - GCP_US: 'https://mc-api.us-central1.gcp.commercetools.com', - AWS_EU: 'https://mc-api.eu-central-1.aws.commercetools.com', - AWS_US: 'https://mc-api.us-east-2.aws.commercetools.com', + [CLOUD_IDENTIFIERS.GCP_AU]: + 'https://mc-api.australia-southeast1.gcp.commercetools.com', + [CLOUD_IDENTIFIERS.GCP_EU]: + 'https://mc-api.europe-west1.gcp.commercetools.com', + [CLOUD_IDENTIFIERS.GCP_US]: + 'https://mc-api.us-central1.gcp.commercetools.com', + [CLOUD_IDENTIFIERS.AWS_EU]: + 'https://mc-api.eu-central-1.aws.commercetools.com', + [CLOUD_IDENTIFIERS.AWS_US]: 'https://mc-api.us-east-2.aws.commercetools.com', /** * @deprecated: use `AWS_EU` instead */ - AWS_FRA: 'https://mc-api.eu-central-1.aws.commercetools.com', + [CLOUD_IDENTIFIERS.AWS_FRA]: + 'https://mc-api.eu-central-1.aws.commercetools.com', /** * @deprecated: use `AWS_US` instead */ - AWS_OHIO: 'https://mc-api.us-east-2.aws.commercetools.com', - /** - * @deprecated: not supported anymore - */ - AWS_CN: 'https://mc-api.cn-northwest-1.aws.commercetools.cn', - AZURE_US: 'https://mc-api.eastus.azure.commercetools.com', - AZURE_EU: 'https://mc-api.germanywestcentral.azure.commercetools.com', + [CLOUD_IDENTIFIERS.AWS_OHIO]: + 'https://mc-api.us-east-2.aws.commercetools.com', } as const; export const MC_API_PROXY_HEADERS = { diff --git a/packages/application-config/src/constants.ts b/packages/application-config/src/constants.ts index f06a94d3e2..17278022b9 100644 --- a/packages/application-config/src/constants.ts +++ b/packages/application-config/src/constants.ts @@ -12,34 +12,28 @@ export const CLOUD_IDENTIFIERS = { * @deprecated: use `AWS_US` instead */ AWS_OHIO: 'aws-ohio', - /** - * @deprecated: not supported anymore - */ - AWS_CN: 'aws-cn', - AZURE_US: 'azure-us', - AZURE_EU: 'azure-eu', } as const; export const MC_API_URLS = { - GCP_AU: 'https://mc-api.australia-southeast1.gcp.commercetools.com', - GCP_EU: 'https://mc-api.europe-west1.gcp.commercetools.com', - GCP_US: 'https://mc-api.us-central1.gcp.commercetools.com', - AWS_EU: 'https://mc-api.eu-central-1.aws.commercetools.com', - AWS_US: 'https://mc-api.us-east-2.aws.commercetools.com', + [CLOUD_IDENTIFIERS.GCP_AU]: + 'https://mc-api.australia-southeast1.gcp.commercetools.com', + [CLOUD_IDENTIFIERS.GCP_EU]: + 'https://mc-api.europe-west1.gcp.commercetools.com', + [CLOUD_IDENTIFIERS.GCP_US]: + 'https://mc-api.us-central1.gcp.commercetools.com', + [CLOUD_IDENTIFIERS.AWS_EU]: + 'https://mc-api.eu-central-1.aws.commercetools.com', + [CLOUD_IDENTIFIERS.AWS_US]: 'https://mc-api.us-east-2.aws.commercetools.com', /** * @deprecated: use `AWS_EU` instead */ - AWS_FRA: 'https://mc-api.eu-central-1.aws.commercetools.com', + [CLOUD_IDENTIFIERS.AWS_FRA]: + 'https://mc-api.eu-central-1.aws.commercetools.com', /** * @deprecated: use `AWS_US` instead */ - AWS_OHIO: 'https://mc-api.us-east-2.aws.commercetools.com', - /** - * @deprecated: not supported anymore - */ - AWS_CN: 'https://mc-api.cn-northwest-1.aws.commercetools.cn', - AZURE_US: 'https://mc-api.eastus.azure.commercetools.com', - AZURE_EU: 'https://mc-api.germanywestcentral.azure.commercetools.com', + [CLOUD_IDENTIFIERS.AWS_OHIO]: + 'https://mc-api.us-east-2.aws.commercetools.com', } as const; export const LOADED_CONFIG_TYPES = { diff --git a/packages/application-config/src/utils.ts b/packages/application-config/src/utils.ts index 8876c498a7..6938bb8d43 100644 --- a/packages/application-config/src/utils.ts +++ b/packages/application-config/src/utils.ts @@ -7,24 +7,17 @@ const mapCloudIdentifierToApiUrl = ( ): string => { switch (key) { case CLOUD_IDENTIFIERS.GCP_AU: - return MC_API_URLS.GCP_AU; + return MC_API_URLS[CLOUD_IDENTIFIERS.GCP_AU]; case CLOUD_IDENTIFIERS.GCP_EU: - return MC_API_URLS.GCP_EU; + return MC_API_URLS[CLOUD_IDENTIFIERS.GCP_EU]; case CLOUD_IDENTIFIERS.GCP_US: - return MC_API_URLS.GCP_US; + return MC_API_URLS[CLOUD_IDENTIFIERS.GCP_US]; case CLOUD_IDENTIFIERS.AWS_EU: case CLOUD_IDENTIFIERS.AWS_FRA: - return MC_API_URLS.AWS_EU; + return MC_API_URLS[CLOUD_IDENTIFIERS.AWS_EU]; case CLOUD_IDENTIFIERS.AWS_US: case CLOUD_IDENTIFIERS.AWS_OHIO: - return MC_API_URLS.AWS_US; - // TODO: remove it - case CLOUD_IDENTIFIERS.AWS_CN: - return MC_API_URLS.AWS_CN; - case CLOUD_IDENTIFIERS.AZURE_US: - return MC_API_URLS.AZURE_US; - case CLOUD_IDENTIFIERS.AZURE_EU: - return MC_API_URLS.AZURE_EU; + return MC_API_URLS[CLOUD_IDENTIFIERS.AWS_US]; default: // We would probably never get to this point, as the JSON schema validation // kicks in before.