Skip to content

Commit

Permalink
feat: ID skrives med storebokstaver
Browse files Browse the repository at this point in the history
  • Loading branch information
Kyrremann committed May 28, 2024
1 parent 3a12cb6 commit 89554d3
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions pkg/resourcecreator/google/sql/instance.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@ func CreateInstance(source Source, ast *resource.Ast, cfg Config) error {
}

naisSqlDatabase := naisSqlInstance.Database()
googleTeamProjectId := cfg.GetGoogleTeamProjectID()
googleTeamProjectID := cfg.GetGoogleTeamProjectID()

googleSqlInstance := CreateGoogleSqlInstance(resource.CreateObjectMeta(source), naisSqlInstance, cfg)
ast.AppendOperation(resource.OperationCreateOrUpdate, googleSqlInstance)

iamPolicyMember := instanceIamPolicyMember(source, googleSqlInstance.Name, cfg)
ast.AppendOperation(resource.OperationCreateIfNotExists, iamPolicyMember)

googleSqlDatabase := GoogleSQLDatabase(resource.CreateObjectMeta(source), googleSqlInstance.Name, naisSqlDatabase.Name, googleTeamProjectId, naisSqlInstance.CascadingDelete)
googleSqlDatabase := GoogleSQLDatabase(resource.CreateObjectMeta(source), googleSqlInstance.Name, naisSqlDatabase.Name, googleTeamProjectID, naisSqlInstance.CascadingDelete)
ast.AppendOperation(resource.OperationCreateIfNotExists, googleSqlDatabase)

CreateGoogleSQLUsers(source, ast, cfg, naisSqlDatabase, naisSqlInstance, googleSqlInstance)
Expand All @@ -99,9 +99,8 @@ func CreateInstance(source Source, ast *resource.Ast, cfg Config) error {
}

if needsProxy {
ast.Containers = append(
ast.Containers, google.CloudSqlProxyContainer(5432, cfg.GetGoogleCloudSQLProxyContainerImage(), cfg.GetGoogleTeamProjectID(), googleSqlInstance.Name),
)
cloudSqlProxyContainer := google.CloudSqlProxyContainer(5432, cfg.GetGoogleCloudSQLProxyContainerImage(), googleTeamProjectID, googleSqlInstance.Name)
ast.Containers = append(ast.Containers, cloudSqlProxyContainer)
}

return nil
Expand Down

0 comments on commit 89554d3

Please sign in to comment.