fix: use hardcoded url for random provider

KusionStack · Aug 29, 2023 · b29dbeb · b29dbeb
1 parent 97b8501
commit b29dbeb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 25 deletions.
diff --git a/pkg/generator/appconfiguration/generator/accessories/database/alicloud_rds.go b/pkg/generator/appconfiguration/generator/accessories/database/alicloud_rds.go
@@ -32,15 +32,8 @@ type alicloudServerlessConfig struct {
 
 func (g *databaseGenerator) generateAlicloudResources(db *database.Database, spec *models.Spec) (*v1.Secret, error) {
 	// Set the terraform random and alicloud provider.
-	var providerURL string
 	randomProvider := &models.Provider{}
-	if tfProviderRandom == "" {
-		providerURL = defaultRandomProvider
-	} else {
-		providerURL = tfProviderRandom
-	}
-
-	if err := randomProvider.SetString(providerURL); err != nil {
+	if err := randomProvider.SetString(randomProviderURL); err != nil {
 		return nil, err
 	}
 
@@ -49,6 +42,7 @@ func (g *databaseGenerator) generateAlicloudResources(db *database.Database, spe
 		return nil, fmt.Errorf("the region of the alicloud provider must be set")
 	}
 
+	var providerURL string
 	alicloudProvider := &models.Provider{}
 	if tfProviderAlicloud == "" {
 		providerURL = defaultAlicloudProvider

diff --git a/pkg/generator/appconfiguration/generator/accessories/database/aws_rds.go b/pkg/generator/appconfiguration/generator/accessories/database/aws_rds.go
@@ -30,15 +30,8 @@ type awsSecurityGroupTraffic struct {
 
 func (g *databaseGenerator) generateAWSResources(db *database.Database, spec *models.Spec) (*v1.Secret, error) {
 	// Set the terraform random and aws provider.
-	var providerURL string
 	randomProvider := &models.Provider{}
-	if tfProviderRandom == "" {
-		providerURL = defaultRandomProvider
-	} else {
-		providerURL = tfProviderRandom
-	}
-
-	if err := randomProvider.SetString(providerURL); err != nil {
+	if err := randomProvider.SetString(randomProviderURL); err != nil {
 		return nil, err
 	}
 
@@ -47,6 +40,7 @@ func (g *databaseGenerator) generateAWSResources(db *database.Database, spec *mo
 		return nil, fmt.Errorf("the region of the aws provider must be set")
 	}
 
+	var providerURL string
 	awsProvider := &models.Provider{}
 	if tfProviderAWS == "" {
 		providerURL = defaultAWSProvider

diff --git a/pkg/generator/appconfiguration/generator/accessories/database/database_generator.go b/pkg/generator/appconfiguration/generator/accessories/database/database_generator.go
@@ -3,7 +3,6 @@ package accessories
 import (
 	"fmt"
 	"net"
-	"os"
 	"strings"
 
 	v1 "k8s.io/api/core/v1"
@@ -16,16 +15,14 @@ import (
 )
 
 const (
-	dbResSuffix           = "-db"
-	randomPassword        = "random_password"
-	defaultRandomProvider = "registry.terraform.io/hashicorp/random/3.5.1"
-	dbHostAddressEnv      = "KUSION_DB_HOST"
-	dbUsernameEnv         = "KUSION_DB_USERNAME"
-	dbPasswordEnv         = "KUSION_DB_PASSWORD"
+	dbResSuffix       = "-db"
+	randomPassword    = "random_password"
+	randomProviderURL = "registry.terraform.io/hashicorp/random/3.5.1"
+	dbHostAddressEnv  = "KUSION_DB_HOST"
+	dbUsernameEnv     = "KUSION_DB_USERNAME"
+	dbPasswordEnv     = "KUSION_DB_PASSWORD"
 )
 
-var tfProviderRandom = os.Getenv("TF_PROVIDER_RANDOM")
-
 type databaseGenerator struct {
 	project  *projectstack.Project
 	stack    *projectstack.Stack