Skip to content

Commit 8770a04

Browse files
committed
Moves checking for unset name to common
1 parent 3ca2429 commit 8770a04

File tree

3 files changed

+16
-9
lines changed

3 files changed

+16
-9
lines changed

internal/generate/identitytests/main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -743,6 +743,10 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) {
743743

744744
if d.HasResourceIdentity() {
745745
if !skip {
746+
if err := tests.Configure(&d.CommonArgs); err != nil {
747+
v.errs = append(v.errs, fmt.Errorf("%s: %w", fmt.Sprintf("%s.%s", v.packageName, v.functionName), err))
748+
return
749+
}
746750
if d.idAttrDuplicates != "" {
747751
d.GoImports = append(d.GoImports,
748752
common.GoImport{
@@ -753,18 +757,13 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) {
753757
},
754758
)
755759
}
756-
if d.Name == "" {
757-
v.errs = append(v.errs, fmt.Errorf("no name parameter set: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName)))
758-
return
759-
}
760760
if d.HasV6_0NullValuesError {
761761
d.PreIdentityVersion = v5_100_0
762762
}
763763
if !d.HasNoPreExistingResource && d.PreIdentityVersion == nil {
764764
v.errs = append(v.errs, fmt.Errorf("preIdentityVersion is required when hasNoPreExistingResource is false: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName)))
765765
return
766766
}
767-
tests.Configure(&d.CommonArgs)
768767
if d.IsARNIdentity() {
769768
d.arnAttribute = d.IdentityAttributeName()
770769
}
@@ -778,6 +777,7 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) {
778777
if d.IsSingletonIdentity() {
779778
d.Serialize = true
780779
}
780+
781781
v.identityResources = append(v.identityResources, d)
782782
}
783783
}

internal/generate/tagstests/main.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -689,15 +689,14 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) {
689689

690690
if tagged {
691691
if !skip {
692-
if d.Name == "" {
693-
v.errs = append(v.errs, fmt.Errorf("no name parameter set: %s", fmt.Sprintf("%s.%s", v.packageName, v.functionName)))
692+
if err := tests.Configure(&d.CommonArgs); err != nil {
693+
v.errs = append(v.errs, fmt.Errorf("%s: %w", fmt.Sprintf("%s.%s", v.packageName, v.functionName), err))
694694
return
695695
}
696696
if !hasIdentifierAttribute && len(d.overrideIdentifierAttribute) == 0 {
697697
v.errs = append(v.errs, fmt.Errorf("@Tags specification for %s does not use identifierAttribute. Missing @Testing(tagsIdentifierAttribute) and possibly tagsResourceType", fmt.Sprintf("%s.%s", v.packageName, v.functionName)))
698698
return
699699
}
700-
tests.Configure(&d.CommonArgs)
701700
if d.HasInherentRegionIdentity() {
702701
if d.Implementation == common.ImplementationFramework {
703702
if !slices.Contains(d.IdentityDuplicateAttrNames, "id") {
@@ -708,6 +707,7 @@ func (v *visitor) processFuncDecl(funcDecl *ast.FuncDecl) {
708707
if d.IsSingletonIdentity() {
709708
d.Serialize = true
710709
}
710+
711711
v.taggedResources = append(v.taggedResources, d)
712712
}
713713
}

internal/generate/tests/annotations.go

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
package tests
55

66
import (
7+
"errors"
78
"fmt"
89
"strings"
910

@@ -491,7 +492,11 @@ func endpointsConstOrQuote(region string) string {
491492
return buf.String()
492493
}
493494

494-
func Configure(d *CommonArgs) {
495+
func Configure(d *CommonArgs) error {
496+
if d.Name == "" {
497+
return errors.New("no name parameter set")
498+
}
499+
495500
if !d.generatorSeen {
496501
d.Generator = "acctest.RandomWithPrefix(t, acctest.ResourcePrefix)"
497502
d.GoImports = append(d.GoImports,
@@ -500,4 +505,6 @@ func Configure(d *CommonArgs) {
500505
},
501506
)
502507
}
508+
509+
return nil
503510
}

0 commit comments

Comments
 (0)