Skip to content

Commit 5dfcda5

Browse files
committed
set generation for a-c in terraform and tpgtools go files
1 parent 248aff7 commit 5dfcda5

File tree

3 files changed

+324
-309
lines changed

3 files changed

+324
-309
lines changed

mmv1/provider/terraform.go

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,15 +71,17 @@ func NewTerraform(product *api.Product, versionName string, startTime time.Time)
7171
}
7272

7373
func (t Terraform) Generate(outputFolder, productPath, resourceToGenerate string, generateCode, generateDocs bool) {
74-
if err := os.MkdirAll(outputFolder, os.ModePerm); err != nil {
75-
log.Println(fmt.Errorf("error creating output directory %v: %v", outputFolder, err))
76-
}
74+
if string(t.Product.ApiName)[0] >= 'a' && string(t.Product.ApiName)[0] <= 'd' {
75+
if err := os.MkdirAll(outputFolder, os.ModePerm); err != nil {
76+
log.Println(fmt.Errorf("error creating output directory %v: %v", outputFolder, err))
77+
}
7778

78-
t.GenerateObjects(outputFolder, resourceToGenerate, generateCode, generateDocs)
79+
t.GenerateObjects(outputFolder, resourceToGenerate, generateCode, generateDocs)
80+
if generateCode {
7981

80-
if generateCode {
81-
t.GenerateProduct(outputFolder)
82-
t.GenerateOperation(outputFolder)
82+
t.GenerateProduct(outputFolder)
83+
t.GenerateOperation(outputFolder)
84+
}
8385
}
8486
}
8587

@@ -105,7 +107,10 @@ func (t *Terraform) GenerateObject(object api.Resource, outputFolder, productPat
105107

106108
if generateCode {
107109
// log.Printf("Generating %s tests", object.Name)
108-
t.GenerateResourceTests(object, *templateData, outputFolder)
110+
if string(object.ApiName)[0] >= 'a' && string(object.ApiName)[0] <= 'd' {
111+
112+
t.GenerateResourceTests(object, *templateData, outputFolder)
113+
}
109114
t.GenerateResourceSweeper(object, *templateData, outputFolder)
110115
t.GenerateSingularDataSource(object, *templateData, outputFolder)
111116
// log.Printf("Generating %s metadata", object.Name)
@@ -119,6 +124,7 @@ func (t *Terraform) GenerateObject(object api.Resource, outputFolder, productPat
119124
}
120125

121126
t.GenerateIamPolicy(object, *templateData, outputFolder, generateCode, generateDocs)
127+
122128
}
123129

124130
func (t *Terraform) GenerateResource(object api.Resource, templateData TemplateData, outputFolder string, generateCode, generateDocs bool) {
@@ -754,6 +760,9 @@ func (t Terraform) ProviderFromVersion() string {
754760
func (t Terraform) GetMmv1ServicesInVersion(products []*api.Product) []string {
755761
var services []string
756762
for _, product := range products {
763+
if string(product.ApiName)[0] < 'a' || string(product.ApiName)[0] > 'd' {
764+
continue
765+
}
757766
if t.TargetVersionName == "ga" {
758767
someResourceInGA := false
759768
for _, object := range product.Objects {
@@ -788,6 +797,9 @@ func (t Terraform) GetMmv1ServicesInVersion(products []*api.Product) []string {
788797
// # mmv1/third_party/terraform/provider/provider_mmv1_resources.go.erb
789798
func (t *Terraform) generateResourcesForVersion(products []*api.Product) {
790799
for _, productDefinition := range products {
800+
if string(productDefinition.ApiName)[0] < 'a' || string(productDefinition.ApiName)[0] > 'd' {
801+
continue
802+
}
791803
service := strings.ToLower(productDefinition.Name)
792804
for _, object := range productDefinition.Objects {
793805
if object.Exclude || object.NotInVersion(productDefinition.VersionObjOrClosest(t.TargetVersionName)) {

mmv1/provider/terraform_tgc_next.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -324,6 +324,9 @@ func (tgc *TerraformGoogleConversionNext) generateResourcesForVersion(products [
324324
resourcesByCaiResourceType := make(map[string][]ResourceIdentifier)
325325

326326
for _, productDefinition := range products {
327+
if string(productDefinition.ApiName)[0] < 'a' || string(productDefinition.ApiName)[0] > 'd' {
328+
continue
329+
}
327330
service := strings.ToLower(productDefinition.Name)
328331
for _, object := range productDefinition.Objects {
329332
if object.Exclude || object.NotInVersion(productDefinition.VersionObjOrClosest(tgc.TargetVersionName)) {

0 commit comments

Comments
 (0)