Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: update the version of alicloud provider #506

Merged
merged 1 commit into from
Sep 5, 2023
Merged

chore: update the version of alicloud provider #506

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions pkg/generator/appconfiguration/generator/accessories/database/alicloud_rds.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"strings"

v1 "k8s.io/api/core/v1"

"kusionstack.io/kusion/pkg/generator/appconfiguration"
"kusionstack.io/kusion/pkg/models"
"kusionstack.io/kusion/pkg/models/appconfiguration/accessories/database"
Expand All @@ -15,7 +16,7 @@ const (
alicloudDBInstance = "alicloud_db_instance"
alicloudDBConnection = "alicloud_db_connection"
alicloudRDSAccount = "alicloud_rds_account"
defaultAlicloudProvider = "registry.terraform.io/aliyun/alicloud/1.209.0"
defaultAlicloudProvider = "registry.terraform.io/aliyun/alicloud/1.209.1"
)

var (
Expand Down Expand Up @@ -61,7 +62,7 @@ func (g *databaseGenerator) generateAlicloudResources(db *database.Database, spe
// Build alicloud_db_connection for alicloud_db_instance.
var alicloudDBConnectionID string
if isPublicAccessible(db.SecurityIPs) {
alicloudDBConnectionID, r = g.generateAlicloudDBConnection(alicloudDBInstanceID, alicloudProviderRegion, alicloudProvider, db)
alicloudDBConnectionID, r = g.generateAlicloudDBConnection(alicloudDBInstanceID, alicloudProviderRegion, alicloudProvider)
spec.Resources = append(spec.Resources, r)
}

Expand All @@ -84,8 +85,10 @@ func (g *databaseGenerator) generateAlicloudResources(db *database.Database, spe
return g.generateDBSecret(hostAddress, db.Username, password, spec)
}

func (g *databaseGenerator) generateAlicloudDBInstance(region string,
provider *models.Provider, db *database.Database,
func (g *databaseGenerator) generateAlicloudDBInstance(
region string,
provider *models.Provider,
db *database.Database,
) (string, models.Resource) {
dbAttrs := map[string]interface{}{
"category": db.Category,
Expand Down Expand Up @@ -125,8 +128,9 @@ func (g *databaseGenerator) generateAlicloudDBInstance(region string,
return id, appconfiguration.TerraformResource(id, nil, dbAttrs, pvdExts)
}

func (g *databaseGenerator) generateAlicloudDBConnection(dbInstanceID, region string,
provider *models.Provider, db *database.Database,
func (g *databaseGenerator) generateAlicloudDBConnection(
dbInstanceID, region string,
provider *models.Provider,
) (string, models.Resource) {
dbConnectionAttrs := map[string]interface{}{
"instance_id": appconfiguration.KusionPathDependency(dbInstanceID, "id"),
Expand All @@ -140,8 +144,8 @@ func (g *databaseGenerator) generateAlicloudDBConnection(dbInstanceID, region st
return id, appconfiguration.TerraformResource(id, nil, dbConnectionAttrs, pvdExts)
}

func (g *databaseGenerator) generateAlicloudRDSAccount(accountName, randomPasswordID, dbInstanceID, region string,
provider *models.Provider, db *database.Database,
func (g *databaseGenerator) generateAlicloudRDSAccount(
accountName, randomPasswordID, dbInstanceID, region string, provider *models.Provider, db *database.Database,
) models.Resource {
rdsAccountAttrs := map[string]interface{}{
"account_name": accountName,
Expand Down
Loading