Removing Gateway and StorageAccount domain attributes (#3984)

* Removing Gateway and StorageAccount domain attributes * Linting
Azure · Dec 4, 2024 · 47590c6 · 47590c6
1 parent 98dc017
commit 47590c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/pkg/deploy/config.go b/pkg/deploy/config.go
@@ -68,7 +68,6 @@ type Configuration struct {
 	GatewayDomains                     []string               `json:"gatewayDomains,omitempty"`
 	GatewayFeatures                    []string               `json:"gatewayFeatures,omitempty"`
 	GatewayMDSDConfigVersion           *string                `json:"gatewayMdsdConfigVersion,omitempty" value:"required"`
-	GatewayStorageAccountDomain        *string                `json:"gatewayStorageAccountDomain,omitempty" value:"required"`
 	GatewayVMSize                      *string                `json:"gatewayVmSize,omitempty"`
 	GatewayVMSSCapacity                *int                   `json:"gatewayVmssCapacity,omitempty"`
 	GlobalResourceGroupName            *string                `json:"globalResourceGroupName,omitempty" value:"required"`
@@ -93,7 +92,6 @@ type Configuration struct {
 	RPParentDomainName                 *string                `json:"rpParentDomainName,omitempty" value:"required"`
 	RPVMSSCapacity                     *int                   `json:"rpVmssCapacity,omitempty"`
 	SSHPublicKey                       *string                `json:"sshPublicKey,omitempty"`
-	StorageAccountDomain               *string                `json:"storageAccountDomain,omitempty" value:"required"`
 	SubscriptionResourceGroupName      *string                `json:"subscriptionResourceGroupName,omitempty" value:"required"`
 	SubscriptionResourceGroupLocation  *string                `json:"subscriptionResourceGroupLocation,omitempty" value:"required"`
 	VMSize                             *string                `json:"vmSize,omitempty" value:"required"`

diff --git a/pkg/deploy/devconfig.go b/pkg/deploy/devconfig.go
@@ -107,13 +107,11 @@ func DevConfig(_env env.Core) (*Config, error) {
 				GatewayResourceGroupName: azureUniquePrefix + "-gwy-" + _env.Location(),
 				RPResourceGroupName:      azureUniquePrefix + "-aro-" + _env.Location(),
 				Configuration: &Configuration{
-					AzureCloudName:              &_env.Environment().ActualCloudName,
-					DatabaseAccountName:         ptr.To(azureUniquePrefix + "-aro-" + _env.Location()),
-					GatewayStorageAccountDomain: ptr.To(azureUniquePrefix + "gwy" + _env.Location() + ".blob." + _env.Environment().StorageEndpointSuffix),
-					KeyvaultDNSSuffix:           &_env.Environment().KeyVaultDNSSuffix,
-					KeyvaultPrefix:              &keyvaultPrefix,
-					StorageAccountDomain:        ptr.To(azureUniquePrefix + "aro" + _env.Location() + ".blob." + _env.Environment().StorageEndpointSuffix),
-					OIDCStorageAccountName:      ptr.To(oidcStorageAccountName),
+					AzureCloudName:         &_env.Environment().ActualCloudName,
+					DatabaseAccountName:    ptr.To(azureUniquePrefix + "-aro-" + _env.Location()),
+					KeyvaultDNSSuffix:      &_env.Environment().KeyVaultDNSSuffix,
+					KeyvaultPrefix:         &keyvaultPrefix,
+					OIDCStorageAccountName: ptr.To(oidcStorageAccountName),
 				},
 			},
 		},