Merge branch 'master' into pr/8186

builder/amazon/common/run_config.go

@@ -1,5 +1,5 @@
 //go:generate struct-markdown
-//go:generate mapstructure-to-hcl2 -type AmiFilterOptions,SecurityGroupFilterOptions,SubnetFilterOptions,VpcFilterOptions
+//go:generate mapstructure-to-hcl2 -type AmiFilterOptions,SecurityGroupFilterOptions,SubnetFilterOptions,VpcFilterOptions,PolicyDocument,Statement
 
 package common
 
@@ -54,13 +54,15 @@ type VpcFilterOptions struct {
 	Filters map[string]string
 }
 
-type PolicyDocument struct {
+type Statement struct {
-	Version   string
-	Statement []struct {
 	Effect   string
 	Action   []string
 	Resource string
-	}
+}
+
+type PolicyDocument struct {
+	Version   string
+	Statement []Statement
 }
 
 func (d *VpcFilterOptions) Empty() bool {

builder/amazon/common/run_config.hcl2spec.go

@@ -1,4 +1,4 @@
-// Code generated by "mapstructure-to-hcl2 -type AmiFilterOptions,SecurityGroupFilterOptions,SubnetFilterOptions,VpcFilterOptions"; DO NOT EDIT.
+// Code generated by "mapstructure-to-hcl2 -type AmiFilterOptions,SecurityGroupFilterOptions,SubnetFilterOptions,VpcFilterOptions,PolicyDocument,Statement"; DO NOT EDIT.
 package common
 
 import (
@@ -30,6 +30,28 @@ func (*FlatAmiFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	return s
 }
 
+// FlatPolicyDocument is an auto-generated flat version of PolicyDocument.
+// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
+type FlatPolicyDocument struct {
+	Version   *string         `cty:"version"`
+	Statement []FlatStatement `cty:"statement"`
+}
+
+// FlatMapstructure returns a new FlatPolicyDocument.
+// FlatPolicyDocument is an auto-generated flat version of PolicyDocument.
+// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
+func (*PolicyDocument) FlatMapstructure() interface{} { return new(FlatPolicyDocument) }
+
+// HCL2Spec returns the hcldec.Spec of a FlatPolicyDocument.
+// This spec is used by HCL to read the fields of FlatPolicyDocument.
+func (*FlatPolicyDocument) HCL2Spec() map[string]hcldec.Spec {
+	s := map[string]hcldec.Spec{
+		"version":   &hcldec.AttrSpec{Name: "version", Type: cty.String, Required: false},
+		"statement": &hcldec.BlockListSpec{TypeName: "statement", Nested: &hcldec.BlockSpec{TypeName: "statement", Nested: hcldec.ObjectSpec((*FlatStatement)(nil).HCL2Spec())}},
+	}
+	return s
+}
+
 // FlatSecurityGroupFilterOptions is an auto-generated flat version of SecurityGroupFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatSecurityGroupFilterOptions struct {
@@ -52,6 +74,30 @@ func (*FlatSecurityGroupFilterOptions) HCL2Spec() map[string]hcldec.Spec {
 	return s
 }
 
+// FlatStatement is an auto-generated flat version of Statement.
+// Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
+type FlatStatement struct {
+	Effect   *string  `cty:"effect"`
+	Action   []string `cty:"action"`
+	Resource *string  `cty:"resource"`
+}
+
+// FlatMapstructure returns a new FlatStatement.
+// FlatStatement is an auto-generated flat version of Statement.
+// Where the contents a fields with a `mapstructure:,squash` tag are bubbled up.
+func (*Statement) FlatMapstructure() interface{} { return new(FlatStatement) }
+
+// HCL2Spec returns the hcldec.Spec of a FlatStatement.
+// This spec is used by HCL to read the fields of FlatStatement.
+func (*FlatStatement) HCL2Spec() map[string]hcldec.Spec {
+	s := map[string]hcldec.Spec{
+		"effect":   &hcldec.AttrSpec{Name: "effect", Type: cty.String, Required: false},
+		"action":   &hcldec.AttrSpec{Name: "action", Type: cty.List(cty.String), Required: false},
+		"resource": &hcldec.AttrSpec{Name: "resource", Type: cty.String, Required: false},
+	}
+	return s
+}
+
 // FlatSubnetFilterOptions is an auto-generated flat version of SubnetFilterOptions.
 // Where the contents of a field with a `mapstructure:,squash` tag are bubbled up.
 type FlatSubnetFilterOptions struct {

builder/amazon/ebs/builder.hcl2spec.go

@@ -55,6 +55,7 @@ type FlatConfig struct {
 	EbsOptimized                              *bool                                  `mapstructure:"ebs_optimized" required:"false" cty:"ebs_optimized"`
 	EnableT2Unlimited                         *bool                                  `mapstructure:"enable_t2_unlimited" required:"false" cty:"enable_t2_unlimited"`
 	IamInstanceProfile                        *string                                `mapstructure:"iam_instance_profile" required:"false" cty:"iam_instance_profile"`
+	TemporaryIamInstanceProfilePolicyDocument *common.FlatPolicyDocument             `mapstructure:"temporary_iam_instance_profile_policy_document" required:"false" cty:"temporary_iam_instance_profile_policy_document"`
 	InstanceInitiatedShutdownBehavior         *string                                `mapstructure:"shutdown_behavior" required:"false" cty:"shutdown_behavior"`
 	InstanceType                              *string                                `mapstructure:"instance_type" required:"true" cty:"instance_type"`
 	SecurityGroupFilter                       *common.FlatSecurityGroupFilterOptions `mapstructure:"security_group_filter" required:"false" cty:"security_group_filter"`
@@ -175,6 +176,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"ebs_optimized":                 &hcldec.AttrSpec{Name: "ebs_optimized", Type: cty.Bool, Required: false},
 		"enable_t2_unlimited":           &hcldec.AttrSpec{Name: "enable_t2_unlimited", Type: cty.Bool, Required: false},
 		"iam_instance_profile":          &hcldec.AttrSpec{Name: "iam_instance_profile", Type: cty.String, Required: false},
+		"temporary_iam_instance_profile_policy_document": &hcldec.BlockSpec{TypeName: "temporary_iam_instance_profile_policy_document", Nested: hcldec.ObjectSpec((*common.FlatPolicyDocument)(nil).HCL2Spec())},
 		"shutdown_behavior":                     &hcldec.AttrSpec{Name: "shutdown_behavior", Type: cty.String, Required: false},
 		"instance_type":                         &hcldec.AttrSpec{Name: "instance_type", Type: cty.String, Required: false},
 		"security_group_filter":                 &hcldec.BlockSpec{TypeName: "security_group_filter", Nested: hcldec.ObjectSpec((*common.FlatSecurityGroupFilterOptions)(nil).HCL2Spec())},

builder/azure/arm/config.hcl2spec.go

@@ -61,6 +61,7 @@ type FlatConfig struct {
 	OSDiskSizeGB                        *int32                             `mapstructure:"os_disk_size_gb" required:"false" cty:"os_disk_size_gb"`
 	AdditionalDiskSize                  []int32                            `mapstructure:"disk_additional_size" required:"false" cty:"disk_additional_size"`
 	DiskCachingType                     *string                            `mapstructure:"disk_caching_type" required:"false" cty:"disk_caching_type"`
+	AllowedInboundIpAddresses           []string                           `mapstructure:"allowed_inbound_ip_addresses" cty:"allowed_inbound_ip_addresses"`
 	UserName                            *string                            `cty:"user_name"`
 	Password                            *string                            `cty:"password"`
 	Type                                *string                            `mapstructure:"communicator" cty:"communicator"`
@@ -167,6 +168,7 @@ func (*FlatConfig) HCL2Spec() map[string]hcldec.Spec {
 		"os_disk_size_gb":                          &hcldec.AttrSpec{Name: "os_disk_size_gb", Type: cty.Number, Required: false},
 		"disk_additional_size":                     &hcldec.AttrSpec{Name: "disk_additional_size", Type: cty.List(cty.Number), Required: false},
 		"disk_caching_type":                        &hcldec.AttrSpec{Name: "disk_caching_type", Type: cty.String, Required: false},
+		"allowed_inbound_ip_addresses":             &hcldec.AttrSpec{Name: "allowed_inbound_ip_addresses", Type: cty.List(cty.String), Required: false},
 		"user_name":                                &hcldec.AttrSpec{Name: "user_name", Type: cty.String, Required: false},
 		"password":                                 &hcldec.AttrSpec{Name: "password", Type: cty.String, Required: false},
 		"communicator":                             &hcldec.AttrSpec{Name: "communicator", Type: cty.String, Required: false},