Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-11-16 01:59:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Normalize URIs for azurerm Terraform provider

Browse source
This commit is contained in:
katexochen 2022-10-12 17:00:59 +02:00 • committed by Paul Meyer
parent 4c0ef09346
commit 4b2dd1317a
3 changed files with 64 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

24
cli/internal/cloudcmd/create.go
View file

@ -81,7 +81,7 @@ func (c *Creator) createGCP(ctx context.Context, cl terraformClient, config *con
) (idFile clusterid.File, retErr error) {
defer rollbackOnError(context.Background(), c.out, &retErr, &rollbackerTerraform{client: cl})
vars := &terraform.GCPVariables{
vars := terraform.GCPVariables{
CommonVariables: terraform.CommonVariables{
Name: name,
CountControlPlanes: controlPlaneCount,
@ -98,7 +98,7 @@ func (c *Creator) createGCP(ctx context.Context, cl terraformClient, config *con
Debug: config.IsDebugCluster(),
}
ip, err := cl.CreateCluster(ctx, name, vars)
ip, err := cl.CreateCluster(ctx, name, &vars)
if err != nil {
return clusterid.File{}, err
}
@ -114,7 +114,7 @@ func (c *Creator) createAzure(ctx context.Context, cl terraformClient, config *c
) (idFile clusterid.File, retErr error) {
defer rollbackOnError(context.Background(), c.out, &retErr, &rollbackerTerraform{client: cl})
vars := &terraform.AzureVariables{
vars := terraform.AzureVariables{
CommonVariables: terraform.CommonVariables{
Name: name,
CountControlPlanes: controlPlaneCount,
@ -131,7 +131,9 @@ func (c *Creator) createAzure(ctx context.Context, cl terraformClient, config *c
Debug: config.IsDebugCluster(),
}
ip, err := cl.CreateCluster(ctx, name, vars)
vars = normalizeAzureURIs(vars)
ip, err := cl.CreateCluster(ctx, name, &vars)
if err != nil {
return clusterid.File{}, err
}
@ -142,6 +144,16 @@ func (c *Creator) createAzure(ctx context.Context, cl terraformClient, config *c
}, nil
}
func normalizeAzureURIs(vars terraform.AzureVariables) terraform.AzureVariables {
vars.UserAssignedIdentity = strings.ReplaceAll(vars.UserAssignedIdentity, "resourcegroup", "resourceGroup")
vars.ImageID = strings.ReplaceAll(vars.ImageID, "CommunityGalleries", "communityGalleries")
vars.ImageID = strings.ReplaceAll(vars.ImageID, "Images", "images")
vars.ImageID = strings.ReplaceAll(vars.ImageID, "Versions", "versions")
return vars
}
func (c *Creator) createQEMU(ctx context.Context, cl terraformClient, lv libvirtRunner, name string, config *config.Config,
controlPlaneCount, workerCount int,
) (idFile clusterid.File, retErr error) {
@ -183,7 +195,7 @@ func (c *Creator) createQEMU(ctx context.Context, cl terraformClient, lv libvirt
metadataLibvirtURI = "qemu:///system"
}
vars := &terraform.QEMUVariables{
vars := terraform.QEMUVariables{
CommonVariables: terraform.CommonVariables{
Name: name,
CountControlPlanes: controlPlaneCount,
@ -200,7 +212,7 @@ func (c *Creator) createQEMU(ctx context.Context, cl terraformClient, lv libvirt
MetadataLibvirtURI: metadataLibvirtURI,
}
ip, err := cl.CreateCluster(ctx, name, vars)
ip, err := cl.CreateCluster(ctx, name, &vars)
if err != nil {
return clusterid.File{}, err
}