Merge pull request #23 from fabi200123/fix-subnetID-schema

Updates IAMInstanceProfile and SubnetID jsonschema

Author: gabriel-samfira

README.md

@@ -102,7 +102,7 @@ To this end, this provider supports the following extra specs schema:
     "properties": {
         "subnet_id": {
             "type": "string",
-            "pattern": "^subnet-[0-9a-fA-F]{17}$"
+            "pattern": "^subnet-(?:[0-9a-fA-F]{8}|[0-9a-fA-F]{17})$"
         },
         "ssh_key_name": {
             "type": "string",

internal/spec/spec.go

@@ -74,7 +74,7 @@ func newExtraSpecsFromBootstrapData(data params.BootstrapInstance) (*extraSpecs,
 }
 
 type extraSpecs struct {
-	SubnetID           *string          `json:"subnet_id,omitempty" jsonschema:"pattern=^subnet-[0-9a-fA-F]{17}$,description=The ID of the subnet formatted as subnet-xxxxxxxxxxxxxxxxx."`
+	SubnetID           *string          `json:"subnet_id,omitempty" jsonschema:"pattern=^subnet-(?:[0-9a-fA-F]{8}|[0-9a-fA-F]{17})$,description=The ID of the subnet formatted as subnet-xxxxxxxxxxxxxxxxx."`
 	SSHKeyName         *string          `json:"ssh_key_name,omitempty" jsonschema:"description=The name of the Key Pair to use for the instance."`
 	IAMInstanceProfile *string          `json:"iam_instance_profile,omitempty" jsonschema:"description=The IAM instance profile to associate with the instance."`
 	Iops               *int32           `json:"iops,omitempty" jsonschema:"description=Specifies the number of IOPS (Input/Output Operations Per Second) provisioned for the volume. Required for io1 and io2 volumes. Optional for gp3 volumes."`

internal/spec/spec_test.go

@@ -70,6 +70,16 @@ func TestExtraSpecsFromBootstrapData(t *testing.T) {
 			},
 			errString: "",
 		},
+		{
+			name: "specs just with older version of subnet_id",
+			input: params.BootstrapInstance{
+				ExtraSpecs: json.RawMessage(`{"subnet_id": "subnet-12345678"}`),
+			},
+			expectedOutput: &extraSpecs{
+				SubnetID: aws.String("subnet-12345678"),
+			},
+			errString: "",
+		},
 		{
 			name: "specs just with ssh_key_name",
 			input: params.BootstrapInstance{
@@ -171,7 +181,7 @@ func TestExtraSpecsFromBootstrapData(t *testing.T) {
 				ExtraSpecs: json.RawMessage(`{"subnet_id": "subnet-1"}`),
 			},
 			expectedOutput: nil,
-			errString:      "subnet_id: Does not match pattern '^subnet-[0-9a-fA-F]{17}$'",
+			errString:      "subnet_id: Does not match pattern '^subnet-(?:[0-9a-fA-F]{8}|[0-9a-fA-F]{17})$'",
 		},
 		{
 			name: "invalid type for subnet_id",