Merge pull request #342 from opendatahub-io/v2.24.0-fixes

V2.24.0 fixes catchup
red-hat-data-services · Jun 21, 2024 · 26d4c00 · 26d4c00
2 parents ef1f2f0 + 5299e20
commit 26d4c00
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/pipelines.cy.ts b/frontend/src/__tests__/cypress/cypress/tests/mocked/pipelines/pipelines.cy.ts
@@ -126,7 +126,7 @@ describe('Pipelines', () => {
           dspVersion: 'v2',
           objectStorage: {
             externalStorage: {
-              host: 's3.amazonaws.com/',
+              host: 's3.amazonaws.com',
               scheme: 'https',
               bucket: 'sdsd',
               region: 'us-east-1',

diff --git a/frontend/src/concepts/pipelines/content/configurePipelinesServer/__tests__/utils.spec.ts b/frontend/src/concepts/pipelines/content/configurePipelinesServer/__tests__/utils.spec.ts
@@ -71,6 +71,16 @@ describe('configure pipeline server utils', () => {
       expect(spec.objectStorage.externalStorage?.host).toBe('s3.amazonaws.com');
     });
 
+    it('should cleanup S3 endpoint host', () => {
+      const secretsResponse = createSecretsResponse();
+      const config = createPipelineServerConfig();
+      config.objectStorage.newValue = [
+        { key: AwsKeys.S3_ENDPOINT, value: 'https://s3.amazonaws.com/' },
+      ];
+      const spec = createDSPipelineResourceSpec(config, secretsResponse);
+      expect(spec.objectStorage.externalStorage?.host).toBe('s3.amazonaws.com');
+    });
+
     it('should parse S3 endpoint without scheme', () => {
       const secretsResponse = createSecretsResponse();
       const config = createPipelineServerConfig();

diff --git a/frontend/src/concepts/pipelines/content/configurePipelinesServer/utils.ts b/frontend/src/concepts/pipelines/content/configurePipelinesServer/utils.ts
@@ -108,7 +108,7 @@ export const createDSPipelineResourceSpec = (
     dspVersion: 'v2',
     objectStorage: {
       externalStorage: {
-        host: externalStorageHost,
+        host: cleanupEndpointHost(externalStorageHost),
         scheme: externalStorageScheme || 'https',
         bucket: awsRecord.AWS_S3_BUCKET || '',
         region: externalStorageRegion,
@@ -157,3 +157,5 @@ export const getLabelName = (index: string): string => {
   const field = PIPELINE_AWS_FIELDS.find((currentField) => currentField.key === index);
   return field ? field.label : '';
 };
+
+const cleanupEndpointHost = (endpoint: string): string => endpoint.replace(/\/$/, '') || '';