Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

馃毀 [WIP] 馃毀 no code modules attribute #672

Closed
wants to merge 3 commits into from
Closed

馃毀 [WIP] 馃毀 no code modules attribute #672

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8533056
create and update no-code module
dsa0x Aug 2, 2022
9820927
undo local replacemenet
dsa0x Oct 13, 2022
2037d88
format registry modules test
miguelhrocha Oct 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
43 changes: 43 additions & 0 deletions tfe/resource_tfe_registry_module.go
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ func resourceTFERegistryModule() *schema.Resource {
return &schema.Resource{
Create: resourceTFERegistryModuleCreate,
Read: resourceTFERegistryModuleRead,
Update: resourceTFERegistryModuleUpdate,
Delete: resourceTFERegistryModuleDelete,
Importer: &schema.ResourceImporter{
State: resourceTFERegistryModuleImporter,
Expand Down Expand Up @@ -75,6 +76,12 @@ func resourceTFERegistryModule() *schema.Resource {
ForceNew: true,
RequiredWith: []string{"registry_name"},
},
"no_code": {
Type: schema.TypeBool,
Optional: true,
Computed: true,
ForceNew: false,
},
"registry_name": {
Type: schema.TypeString,
Optional: true,
Expand Down Expand Up @@ -117,6 +124,7 @@ func resourceTFERegistryModuleCreateWithoutVCS(meta interface{}, d *schema.Resou
options := tfe.RegistryModuleCreateOptions{
Name: tfe.String(d.Get("name").(string)),
Provider: tfe.String(d.Get("module_provider").(string)),
NoCode: d.Get("no_code").(bool),
}

if registryName, ok := d.GetOk("registry_name"); ok {
Expand Down Expand Up @@ -189,6 +197,41 @@ func resourceTFERegistryModuleCreate(d *schema.ResourceData, meta interface{}) e
return resourceTFERegistryModuleRead(d, meta)
}

func resourceTFERegistryModuleUpdate(d *schema.ResourceData, meta interface{}) error {
tfeClient := meta.(*tfe.Client)

options := tfe.RegistryModuleUpdateOptions{
NoCode: tfe.Bool(d.Get("no_code").(bool)),
}
var registryModule *tfe.RegistryModule
var err error

rmID := tfe.RegistryModuleID{
Organization: d.Get("organization").(string),
Name: d.Get("name").(string),
Provider: d.Get("module_provider").(string),
Namespace: d.Get("namespace").(string),
RegistryName: tfe.RegistryName(d.Get("registry_name").(string)),
}

err = resource.Retry(time.Duration(5)*time.Minute, func() *resource.RetryError {
registryModule, err = tfeClient.RegistryModules.Update(ctx, rmID, options)
if err != nil {
return resource.RetryableError(err)
}
return nil
})

if err != nil {
return fmt.Errorf("Error while waiting for module %s/%s to be ingested: %w", registryModule.Organization.Name, registryModule.Name, err)
}

d.SetId(registryModule.ID)
d.Set("no_code", registryModule.NoCode)

return nil
}

func resourceTFERegistryModuleRead(d *schema.ResourceData, meta interface{}) error {
tfeClient := meta.(*tfe.Client)

Expand Down
73 changes: 73 additions & 0 deletions tfe/resource_tfe_registry_module_test.go
View file
Open in desktop
Expand Up @@ -230,6 +230,61 @@ func TestAccTFERegistryModule_publicRegistryModule(t *testing.T) {
"tfe_registry_module.foobar", "namespace", expectedRegistryModuleAttributes.Namespace),
resource.TestCheckResourceAttr(
"tfe_registry_module.foobar", "registry_name", string(expectedRegistryModuleAttributes.RegistryName)),
resource.TestCheckResourceAttr(
"tfe_registry_module.foobar", "no_code", "false"),
),
},
},
})
}

func TestAccTFERegistryModule_noCodeModule(t *testing.T) {
registryModule := &tfe.RegistryModule{}
rInt := rand.New(rand.NewSource(time.Now().UnixNano())).Int()
orgName := fmt.Sprintf("tst-terraform-%d", rInt)

expectedRegistryModuleAttributes := &tfe.RegistryModule{
Name: "vpc",
Provider: "aws",
RegistryName: tfe.PublicRegistry,
Namespace: "terraform-aws-modules",
Organization: &tfe.Organization{Name: orgName},
NoCode: true,
}

resource.Test(t, resource.TestCase{
IsUnitTest: true,
PreCheck: func() {
testAccPreCheck(t)
},
Providers: testAccProviders,
CheckDestroy: testAccCheckTFERegistryModuleDestroy,
Steps: []resource.TestStep{
{
Config: testAccTFERegistryModule_NoCode(rInt),
Check: resource.ComposeTestCheckFunc(
testAccCheckTFERegistryModuleExists(
"tfe_registry_module.foobar",
tfe.RegistryModuleID{
Organization: orgName,
Name: expectedRegistryModuleAttributes.Name,
Provider: expectedRegistryModuleAttributes.Provider,
RegistryName: expectedRegistryModuleAttributes.RegistryName,
Namespace: expectedRegistryModuleAttributes.Namespace,
}, registryModule),
testAccCheckTFERegistryModuleAttributes(registryModule, expectedRegistryModuleAttributes),
resource.TestCheckResourceAttr(
"tfe_registry_module.foobar", "organization", orgName),
resource.TestCheckResourceAttr(
"tfe_registry_module.foobar", "name", expectedRegistryModuleAttributes.Name),
resource.TestCheckResourceAttr(
"tfe_registry_module.foobar", "module_provider", expectedRegistryModuleAttributes.Provider),
resource.TestCheckResourceAttr(
"tfe_registry_module.foobar", "namespace", expectedRegistryModuleAttributes.Namespace),
resource.TestCheckResourceAttr(
"tfe_registry_module.foobar", "registry_name", string(expectedRegistryModuleAttributes.RegistryName)),
resource.TestCheckResourceAttr(
"tfe_registry_module.foobar", "no_code", fmt.Sprint(expectedRegistryModuleAttributes.NoCode)),
),
},
},
Expand Down Expand Up @@ -674,6 +729,24 @@ resource "tfe_registry_module" "foobar" {
rInt)
}

func testAccTFERegistryModule_NoCode(rInt int) string {
return fmt.Sprintf(`
resource "tfe_organization" "foobar" {
name = "tst-terraform-%d"
email = "admin@company.com"
}

resource "tfe_registry_module" "foobar" {
organization = tfe_organization.foobar.id
namespace = "terraform-aws-modules"
module_provider = "aws"
name = "vpc"
registry_name = "public"
no_code = true
}`,
rInt)
}

func testAccTFERegistryModule_invalidWithBothVCSRepoAndModuleProvider() string {
return `
resource "tfe_registry_module" "foobar" {
Expand Down