enable gp3 storage_type for aws_db_instance

.changelog/27670.txt

@@ -0,0 +1,15 @@
+```release-note:enhancement
+resource/aws_db_instance: Add support for `gp3` `storage_type` value
+```
+
+```release-note:enhancement
+resource/aws_db_instance: Add `storage_throughput` argument
+```
+
+```release-note:enhancement
+data-source/aws_db_instance: Add `storage_throughput` attribute
+```
+
+```release-note:enhancement
+resource/aws_db_instance: Change `iops` to `Computed`
+```

internal/generate/awsclient/main.go

@@ -36,7 +36,7 @@ func main() {
 
 	g.Infof("generating internal/conns/%s\n", filename)
 
-	data, err := common.ReadAllNamesData(namesDataFile)
+	data, err := common.ReadAllCSVData(namesDataFile)
 
 	if err != nil {
 		g.Fatalf("error reading %s: %s", namesDataFile, err.Error())
@@ -89,7 +89,7 @@ func main() {
 		return td.Services[i].ProviderNameUpper < td.Services[j].ProviderNameUpper
 	})
 
-	if err := g.ApplyAndWriteTemplate(filename, "awsclient", tmpl, td); err != nil {
+	if err := g.ApplyAndWriteGoTemplate(filename, "awsclient", tmpl, td); err != nil {
 		g.Fatalf("error: %s", err.Error())
 	}
 }

internal/generate/clientconfig/main.go

@@ -36,7 +36,7 @@ func main() {
 
 	g.Infof("generating internal/conns/%s\n", filename)
 
-	data, err := common.ReadAllNamesData(namesDataFile)
+	data, err := common.ReadAllCSVData(namesDataFile)
 
 	if err != nil {
 		g.Fatalf("error reading %s: %s", namesDataFile, err.Error())
@@ -89,7 +89,7 @@ func main() {
 		return td.Services[i].ProviderNameUpper < td.Services[j].ProviderNameUpper
 	})
 
-	if err := g.ApplyAndWriteTemplate(filename, "config", tmpl, td); err != nil {
+	if err := g.ApplyAndWriteGoTemplate(filename, "config", tmpl, td); err != nil {
 		g.Fatalf("error: %s", err.Error())
 	}
 }

internal/generate/common/namesdata.go → internal/generate/common/csvdata.go

@@ -6,7 +6,7 @@ import (
 	"os"
 )
 
-func ReadAllNamesData(filename string) ([][]string, error) {
+func ReadAllCSVData(filename string) ([][]string, error) {
 	f, err := os.Open(filename)
 
 	if err != nil {

internal/generate/common/generator.go

@@ -24,7 +24,7 @@ func NewGenerator() *Generator {
 	}
 }
 
-func (g *Generator) ApplyAndWriteTemplate(filename, templateName, templateBody string, templateData any) error {
+func (g *Generator) ApplyAndWriteTemplate(filename, templateName, templateBody string, templateData any, formatter func([]byte) ([]byte, error)) error {
 	tmpl, err := template.New(templateName).Parse(templateBody)
 
 	if err != nil {
@@ -38,11 +38,17 @@ func (g *Generator) ApplyAndWriteTemplate(filename, templateName, templateBody s
 		return fmt.Errorf("executing template: %w", err)
 	}
 
-	generatedFileContents, err := format.Source(buffer.Bytes())
+	var generatedFileContents []byte
 
-	if err != nil {
-		g.Infof("%s", buffer.String())
-		return fmt.Errorf("formatting generated source code: %w", err)
+	if formatter != nil {
+		generatedFileContents, err = formatter(buffer.Bytes())
+
+		if err != nil {
+			g.Infof("%s", buffer.String())
+			return fmt.Errorf("formatting generated source code: %w", err)
+		}
+	} else {
+		generatedFileContents = buffer.Bytes()
 	}
 
 	f, err := os.OpenFile(filename, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644) //nolint:gomnd
@@ -62,6 +68,10 @@ func (g *Generator) ApplyAndWriteTemplate(filename, templateName, templateBody s
 	return nil
 }
 
+func (g *Generator) ApplyAndWriteGoTemplate(filename, templateName, templateBody string, templateData any) error {
+	return g.ApplyAndWriteTemplate(filename, templateName, templateBody, templateData, format.Source)
+}
+
 func (g *Generator) Errorf(format string, a ...interface{}) {
 	g.ui.Error(fmt.Sprintf(format, a...))
 }

internal/generate/namescapslist/file.tmpl

@@ -0,0 +1,7 @@
+The caps enforced are as follows:
+
+| Wrong | Right | Test# |
+| --- | --- | --- |
+{{- range .BadCaps }}
+| {{ .Wrong }} | {{ .Right }} | {{ .Test }} |
+{{- end }}

internal/generate/namescapslist/main.go

@@ -4,20 +4,20 @@
 package main
 
 import (
-	"bytes"
 	_ "embed"
-	"encoding/csv"
 	"fmt"
-	"log"
-	"os"
 	"sort"
 	"strings"
-	"text/template"
+
+	"github.com/hashicorp/terraform-provider-aws/internal/generate/common"
 )
 
 //go:embed header.tmpl
 var header string
 
+//go:embed file.tmpl
+var tmpl string
+
 const (
 	filename     = "../../../names/caps.md"
 	capsDataFile = "../../../names/caps.csv"
@@ -35,29 +35,29 @@ type TemplateData struct {
 }
 
 func main() {
-	fmt.Printf("Generating %s\n", strings.TrimPrefix(filename, "../../../"))
+	g := common.NewGenerator()
 
-	badCaps := readBadCaps()
+	g.Infof("Generating %s", strings.TrimPrefix(filename, "../../../"))
 
-	td := TemplateData{}
-	td.BadCaps = badCaps
+	badCaps, err := readBadCaps(capsDataFile)
 
-	writeTemplate(header+tmpl, "namescapslist", td)
-}
-
-func readBadCaps() []CapsDatum {
-	cf, err := os.Open(capsDataFile)
 	if err != nil {
-		log.Fatal(err)
+		g.Fatalf("error reading %s: %s", capsDataFile, err.Error())
 	}
 
-	defer cf.Close()
+	td := TemplateData{}
+	td.BadCaps = badCaps
+
+	if err := g.ApplyAndWriteTemplate(filename, "namescapslist", header+"\n"+tmpl+"\n", td, nil); err != nil {
+		g.Fatalf("error: %s", err.Error())
+	}
+}
 
-	csvReader := csv.NewReader(cf)
+func readBadCaps(filename string) ([]CapsDatum, error) {
+	caps, err := common.ReadAllCSVData(filename)
 
-	caps, err := csvReader.ReadAll()
 	if err != nil {
-		log.Fatal(err)
+		return nil, err
 	}
 
 	var capsList []CapsDatum
@@ -104,43 +104,5 @@ func readBadCaps() []CapsDatum {
 		return strings.ToLower(capsList[i].Wrong) < strings.ToLower(capsList[j].Wrong)
 	})
 
-	return capsList
+	return capsList, nil
 }
-
-func writeTemplate(body string, templateName string, td TemplateData) {
-	// If the file doesn't exist, create it, or truncate the file
-	f, err := os.OpenFile(filename, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		log.Fatalf("error opening file (%s): %s", filename, err)
-	}
-
-	tplate, err := template.New(templateName).Parse(body)
-	if err != nil {
-		log.Fatalf("error parsing template: %s", err)
-	}
-
-	var buffer bytes.Buffer
-	err = tplate.Execute(&buffer, td)
-	if err != nil {
-		log.Fatalf("error executing template: %s", err)
-	}
-
-	if _, err := f.Write(buffer.Bytes()); err != nil {
-		f.Close()
-		log.Fatalf("error writing to file (%s): %s", filename, err)
-	}
-
-	if err := f.Close(); err != nil {
-		log.Fatalf("error closing file (%s): %s", filename, err)
-	}
-}
-
-var tmpl = `
-The caps enforced are as follows:
-
-| Wrong | Right | Test# |
-| --- | --- | --- |
-{{- range .BadCaps }}
-| {{ .Wrong }} | {{ .Right }} | {{ .Test }} |
-{{- end }}
-`

internal/generate/servicepackagedata/main.go

@@ -33,7 +33,7 @@ func main() {
 		PackageName: os.Getenv("GOPACKAGE"),
 	}
 
-	if err := g.ApplyAndWriteTemplate(filename, "servicepackagedata", tmpl, templateData); err != nil {
+	if err := g.ApplyAndWriteGoTemplate(filename, "servicepackagedata", tmpl, templateData); err != nil {
 		g.Fatalf("error generating %s service package data: %s", templateData.PackageName, err.Error())
 	}
 }

internal/service/rds/consts.go

@@ -26,13 +26,15 @@ const (
 const (
 	storageTypeStandard = "standard"
 	storageTypeGP2      = "gp2"
+	storageTypeGP3      = "gp3"
 	storageTypeIO1      = "io1"
 )
 
 func StorageType_Values() []string {
 	return []string{
 		storageTypeStandard,
 		storageTypeGP2,
+		storageTypeGP3,
 		storageTypeIO1,
 	}
 }