Added locations and location_types to the output. #15272

aws/data_source_aws_ec2_instance_type_offerings.go

@@ -20,14 +20,20 @@ func dataSourceAwsEc2InstanceTypeOfferings() *schema.Resource {
 				Computed: true,
 				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
+			"locations": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
+			},
 			"location_type": {
-				Type:     schema.TypeString,
-				Optional: true,
-				ValidateFunc: validation.StringInSlice([]string{
-					ec2.LocationTypeAvailabilityZone,
-					ec2.LocationTypeAvailabilityZoneId,
-					ec2.LocationTypeRegion,
-				}, false),
+				Type:         schema.TypeString,
+				Optional:     true,
+				ValidateFunc: validation.StringInSlice(ec2.LocationType_Values(), false),
+			},
+			"location_types": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem:     &schema.Schema{Type: schema.TypeString},
 			},
 		},
 	}
@@ -48,40 +54,38 @@ func dataSourceAwsEc2InstanceTypeOfferingsRead(d *schema.ResourceData, meta inte
 
 	var instanceTypes []string
 	var locations []string
+	var locationTypes []string
 
-	for {
-		output, err := conn.DescribeInstanceTypeOfferings(input)
-
-		if err != nil {
-			return fmt.Errorf("error reading EC2 Instance Type Offerings: %w", err)
-		}
-
-		if output == nil {
-			break
+	err := conn.DescribeInstanceTypeOfferingsPages(input, func(page *ec2.DescribeInstanceTypeOfferingsOutput, lastPage bool) bool {
+		if page == nil {
+			return !lastPage
 		}
 
-		for _, instanceTypeOffering := range output.InstanceTypeOfferings {
+		for _, instanceTypeOffering := range page.InstanceTypeOfferings {
 			if instanceTypeOffering == nil {
 				continue
 			}
 
 			instanceTypes = append(instanceTypes, aws.StringValue(instanceTypeOffering.InstanceType))
 			locations = append(locations, aws.StringValue(instanceTypeOffering.Location))
+			locationTypes = append(locationTypes, aws.StringValue(instanceTypeOffering.LocationType))
 		}
 
-		if aws.StringValue(output.NextToken) == "" {
-			break
-		}
+		return !lastPage
+	})
 
-		input.NextToken = output.NextToken
+	if err != nil {
+		return fmt.Errorf("error reading EC2 Instance Type Offerings: %w", err)
 	}
 
 	if err := d.Set("instance_types", instanceTypes); err != nil {
 		return fmt.Errorf("error setting instance_types: %w", err)
 	}
-
 	if err := d.Set("locations", locations); err != nil {
-		return fmt.Errorf("error setting locations: %s", err)
+		return fmt.Errorf("error setting locations: %w", err)
+	}
+	if err := d.Set("location_types", locationTypes); err != nil {
+		return fmt.Errorf("error setting location_types: %w", err)
 	}
 
 	d.SetId(meta.(*AWSClient).region)

aws/data_source_aws_ec2_instance_type_offerings_test.go

@@ -60,6 +60,14 @@ func testAccCheckEc2InstanceTypeOfferingsInstanceTypes(dataSourceName string) re
 			return fmt.Errorf("expected at least one instance_types result, got none")
 		}
 
+		if v := rs.Primary.Attributes["locations.#"]; v == "0" {
+			return fmt.Errorf("expected at least one locations result, got none")
+		}
+
+		if v := rs.Primary.Attributes["location_types.#"]; v == "0" {
+			return fmt.Errorf("expected at least one location_types result, got none")
+		}
+
 		return nil
 	}
 }