fix: set gcp overrides and other fixes (#328)

Author: goncalo-rodrigues

resources/common/cloud_provider.go

@@ -73,6 +73,7 @@ var AVAILABILITY_ZONES = map[commonpb.Location]map[commonpb.CloudProvider][]stri
 	commonpb.Location_EU_WEST_2: {
 		AWS:   []string{"eu-west-2a", "eu-west-2b", "eu-west-2c"},
 		AZURE: []string{"1", "2", "3"},
+		GCP:   []string{"europe-west2-a", "europe-west2-b", "europe-west2-c"},
 	},
 	commonpb.Location_EU_WEST_3: {
 		AWS:   []string{"eu-west-3a", "eu-west-3b", "eu-west-3c"},

resources/output/provider/gcp_provider.go

@@ -7,4 +7,5 @@ type GcpProvider struct {
 	Region       string `hcl:"region"`
 	Alias        string `hcl:"alias"`
 	Credentials  string `hcl:"credentials" hcle:"omitempty"`
+	Project      string `hcl:"project" hcle:"omitempty"`
 }

resources/output/virtual_machine/azure_virtual_machine.go

@@ -65,6 +65,10 @@ func GetLatestAzureSourceImageReference(ref *resourcespb.ImageReference) (AzureS
 		offer = "UbuntuServer"
 		publisher = "Canonical"
 		version = fmt.Sprintf("%s-LTS", version)
+		if ref.Version == "20.04" {
+			offer = "0001-com-ubuntu-server-focal"
+			version = "20_04-lts"
+		}
 	case resourcespb.ImageReference_DEBIAN:
 		offer = fmt.Sprintf("debian-%s", ref.Version)
 		publisher = "Debian"

resources/types/aws/network_security_group.go

@@ -38,6 +38,7 @@ func (r AwsNetworkSecurityGroup) FromState(_ *output.TfState) (*resourcespb.Netw
 		Name:             r.Args.Name,
 		VirtualNetworkId: r.Args.VirtualNetworkId,
 		Rules:            r.Args.Rules,
+		GcpOverride:      r.Args.GcpOverride,
 	}, nil
 }
 

resources/types/aws/public_ip.go

@@ -37,9 +37,9 @@ func (r AwsPublicIp) FromState(state *output.TfState) (*resourcespb.PublicIpReso
 			CloudProvider:   r.Args.CommonParameters.CloudProvider,
 			NeedsUpdate:     false,
 		},
-		Name: r.Args.Name,
-
-		Ip: ip,
+		Name:        r.Args.Name,
+		Ip:          ip,
+		GcpOverride: r.Args.GcpOverride,
 	}, nil
 }
 

resources/types/aws/virtual_machine.go

@@ -75,9 +75,9 @@ func (r AwsVirtualMachine) FromState(state *output.TfState) (*resourcespb.Virtua
 		ImageReference:          r.Args.ImageReference,
 		AwsOverride:             r.Args.AwsOverride,
 		AzureOverride:           r.Args.AzureOverride,
-
-		PublicIp:   ip,
-		IdentityId: identityId,
+		GcpOverride:             r.Args.GcpOverride,
+		PublicIp:                ip,
+		IdentityId:              identityId,
 	}, nil
 }
 

resources/types/azure/network_security_group.go

@@ -33,6 +33,7 @@ func (r AzureNetworkSecurityGroup) FromState(_ *output.TfState) (*resourcespb.Ne
 		Name:             r.Args.Name,
 		VirtualNetworkId: r.Args.VirtualNetworkId,
 		Rules:            r.Args.Rules,
+		GcpOverride:      r.Args.GcpOverride,
 	}, nil
 }
 

resources/types/azure/public_ip.go

@@ -37,9 +37,9 @@ func (r AzurePublicIp) FromState(state *output.TfState) (*resourcespb.PublicIpRe
 			CloudProvider:   r.Args.CommonParameters.CloudProvider,
 			NeedsUpdate:     false,
 		},
-		Name: r.Args.Name,
-
-		Ip: ip,
+		Name:        r.Args.Name,
+		Ip:          ip,
+		GcpOverride: r.Args.GcpOverride,
 	}, nil
 }
 

resources/types/azure/virtual_machine.go

@@ -49,14 +49,6 @@ func (r AzureVirtualMachine) FromState(state *output.TfState) (*resourcespb.Virt
 		identityId = vmResource.Identities[0].PrincipalId
 	}
 
-	// TODO: handle default values on create
-	if r.Args.ImageReference == nil {
-		r.Args.ImageReference = &resourcespb.ImageReference{
-			Os:      resourcespb.ImageReference_UBUNTU,
-			Version: "16.04",
-		}
-	}
-
 	return &resourcespb.VirtualMachineResource{
 		CommonParameters: &commonpb.CommonResourceParameters{
 			ResourceId:      r.ResourceId,
@@ -77,9 +69,9 @@ func (r AzureVirtualMachine) FromState(state *output.TfState) (*resourcespb.Virt
 		ImageReference:          r.Args.ImageReference,
 		AwsOverride:             r.Args.AwsOverride,
 		AzureOverride:           r.Args.AzureOverride,
-
-		PublicIp:   ip,
-		IdentityId: identityId,
+		GcpOverride:             r.Args.GcpOverride,
+		PublicIp:                ip,
+		IdentityId:              identityId,
 	}, nil
 }
 

resources/types/gcp/network_security_group.go

@@ -33,6 +33,7 @@ func (r GcpNetworkSecurityGroup) FromState(_ *output.TfState) (*resourcespb.Netw
 		Name:             r.Args.Name,
 		VirtualNetworkId: r.Args.VirtualNetworkId,
 		Rules:            r.Args.Rules,
+		GcpOverride:      r.Args.GcpOverride,
 	}, nil
 }