Refactor S3 provider handling and add zone ID to parameters in zone launch

Author: Daman Arora

ui/src/views/infra/AddSecondaryStorage.vue

@@ -347,7 +347,7 @@ export default {
           data.url = url
         }
         data.provider = provider
-        if (values.zone && !['Swift', 'S3'].includes(provider)) {
+        if (values.zone && !['Swift'].includes(provider)) {
           data.zoneid = values.zone
         }
 

ui/src/views/infra/zone/ZoneWizardAddResources.vue

@@ -1094,19 +1094,12 @@ export default {
       })
     },
     fetchProvider () {
-      const storageProviders = []
-      api('listImageStores', { provider: 'S3' }).then(json => {
-        const s3stores = json.listimagestoresresponse.imagestore
-        if (s3stores != null && s3stores.length > 0) {
-          storageProviders.push({ id: 'S3', description: 'S3' })
-        } else {
-          storageProviders.push({ id: 'NFS', description: 'NFS' })
-          storageProviders.push({ id: 'SMB', description: 'SMB/CIFS' })
-          storageProviders.push({ id: 'S3', description: 'S3' })
-          storageProviders.push({ id: 'Swift', description: 'Swift' })
-        }
-        this.storageProviders = storageProviders
-      })
+      this.storageProviders = [
+        { id: 'NFS', description: 'NFS' },
+        { id: 'SMB', description: 'SMB/CIFS' },
+        { id: 'S3', description: 'S3' },
+        { id: 'Swift', description: 'Swift' }
+      ]
     },
     fetchPrimaryStorageProvider () {
       this.primaryStorageProviders = []

ui/src/views/infra/zone/ZoneWizardLaunchZone.vue

@@ -1596,6 +1596,7 @@ export default {
         params['details[2].value'] = this.prefillContent.secondaryStorageSMBDomain
       } else if (this.prefillContent.secondaryStorageProvider === 'S3') {
         params.provider = this.prefillContent.secondaryStorageProvider
+        params.zoneid = this.stepData.zoneReturned.id
         params['details[0].key'] = 'accesskey'
         params['details[0].value'] = this.prefillContent.secondaryStorageAccessKey
         params['details[1].key'] = 'secretkey'