add json tag

Author: Emyrk

extract/preset.go

@@ -65,7 +65,7 @@ func PresetFromBlock(block *terraform.Block) (tfPreset types.Preset) {
 
 	prebuildBlock := block.GetBlock("prebuilds")
 	if prebuildBlock != nil {
-		p.Prebuild = &types.PrebuildData{
+		p.Prebuilds = &types.PrebuildData{
 			// Invalid values will be set to 0
 			Instances: int(optionalInteger(prebuildBlock, "instances")),
 		}

preview.go

@@ -79,7 +79,7 @@ func (o Output) MarshalJSON() ([]byte, error) {
 func ValidatePrebuilds(ctx context.Context, input Input, preValid []types.Preset, dir fs.FS) {
 	for i := range preValid {
 		pre := &preValid[i]
-		if pre.Prebuild == nil || pre.Prebuild.Instances <= 0 {
+		if pre.Prebuilds == nil || pre.Prebuilds.Instances <= 0 {
 			// No prebuilds, so presets do not need to be valid without user input
 			continue
 		}
@@ -232,7 +232,7 @@ func Preview(ctx context.Context, input Input, dir fs.FS) (output *Output, diagn
 	diags := make(hcl.Diagnostics, 0)
 	rp, rpDiags := parameters(modules)
 	// preValidPresets are extracted as written in terraform. Each individual
-	// param value is checked, however the preset as a whole might not valid.
+	// param value is checked, however, the preset as a whole might not be valid.
 	preValidPresets := presets(modules, rp)
 	tags, tagDiags := workspaceTags(modules, p.Files())
 	vars := variables(modules)

preview_test.go

@@ -950,11 +950,11 @@ func (a assertPreset) def(def bool) assertPreset {
 
 func (a assertPreset) prebuildCount(exp int) assertPreset {
 	return a.extend(func(t *testing.T, preset types.Preset) {
-		if exp == 0 && preset.Prebuild == nil {
+		if exp == 0 && preset.Prebuilds == nil {
 			return
 		}
-		require.NotNilf(t, preset.Prebuild, "prebuild should not be nil, expected %d instances", exp)
-		require.Equal(t, exp, preset.Prebuild.Instances)
+		require.NotNilf(t, preset.Prebuilds, "prebuild should not be nil, expected %d instances", exp)
+		require.Equal(t, exp, preset.Prebuilds.Instances)
 	})
 }
 

types/preset.go

@@ -19,5 +19,5 @@ type PresetData struct {
 	Name       string            `json:"name"`
 	Parameters map[string]string `json:"parameters"`
 	Default    bool              `json:"default"`
-	Prebuild   *PrebuildData
+	Prebuilds  *PrebuildData     `json:"prebuilds,omitempty"`
 }