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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(launchconfiguration): Move to autoscaling service #318

Merged
merged 1 commit into from
Jul 27, 2023
Merged

refactor(launchconfiguration): Move to autoscaling service #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions internal/provider/provider.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import (
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/cdss"
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/classicloadbalancer"
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/devtools"
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/launchconfiguration"
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/loadbalancer"
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/loginkey"
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/memberserverimage"
Expand Down Expand Up @@ -44,7 +43,7 @@ func Provider() *schema.Provider {
"ncloud_cdss_os_image": cdss.DataSourceNcloudCDSSOsImage(),
"ncloud_cdss_os_images": cdss.DataSourceNcloudCDSSOsImages(),
"ncloud_init_script": server.DataSourceNcloudInitScript(),
"ncloud_launch_configuration": launchconfiguration.DataSourceNcloudLaunchConfiguration(),
"ncloud_launch_configuration": autoscaling.DataSourceNcloudLaunchConfiguration(),
"ncloud_lb": loadbalancer.DataSourceNcloudLb(),
"ncloud_lb_listener": loadbalancer.DataSourceNcloudLbListener(),
"ncloud_lb_target_group": loadbalancer.DataSourceNcloudLbTargetGroup(),
Expand Down Expand Up @@ -120,7 +119,7 @@ func Provider() *schema.Provider {
"ncloud_cdss_cluster": cdss.ResourceNcloudCDSSCluster(),
"ncloud_cdss_config_group": cdss.ResourceNcloudCDSSConfigGroup(),
"ncloud_init_script": server.ResourceNcloudInitScript(),
"ncloud_launch_configuration": launchconfiguration.ResourceNcloudLaunchConfiguration(),
"ncloud_launch_configuration": autoscaling.ResourceNcloudLaunchConfiguration(),
"ncloud_lb_listener": loadbalancer.ResourceNcloudLbListener(),
"ncloud_lb_target_group_attachment": loadbalancer.ResourceNcloudLbTargetGroupAttachment(),
"ncloud_lb_target_group": loadbalancer.ResourceNcloudLbTargetGroup(),
Expand Down
2 changes: 1 addition & 1 deletion ...chconfiguration/accesscontrolgrouplist.go → ...ice/autoscaling/accesscontrolgrouplist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package launchconfiguration
package autoscaling

import "github.com/NaverCloudPlatform/ncloud-sdk-go-v2/services/autoscaling"

Expand Down
5 changes: 2 additions & 3 deletions internal/service/autoscaling/auto_scaling_group.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import (

. "github.com/terraform-providers/terraform-provider-ncloud/internal/common"
"github.com/terraform-providers/terraform-provider-ncloud/internal/conn"
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/launchconfiguration"
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/vpc"
. "github.com/terraform-providers/terraform-provider-ncloud/internal/verify"
)
Expand Down Expand Up @@ -204,7 +203,7 @@ func createClassicAutoScalingGroup(d *schema.ResourceData, config *conn.Provider
return nil, ErrorRequiredArgOnClassic("zone_no_list")
}
// TODO : Zero value 핸들링
l, err := launchconfiguration.GetClassicLaunchConfigurationByNo(StringPtrOrNil(d.GetOk("launch_configuration_no")), config)
l, err := GetClassicLaunchConfigurationByNo(StringPtrOrNil(d.GetOk("launch_configuration_no")), config)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -441,7 +440,7 @@ func changeClassicAutoScalingGroup(d *schema.ResourceData, config *conn.Provider
}

if d.HasChange("launch_configuration_no") {
launchConfiguration, err := launchconfiguration.GetClassicLaunchConfigurationByNo(ncloud.String(d.Get("launch_configuration_no").(string)), config)
launchConfiguration, err := GetClassicLaunchConfigurationByNo(ncloud.String(d.Get("launch_configuration_no").(string)), config)
if err != nil {
return err
}
Expand Down
2 changes: 1 addition & 1 deletion ...unchconfiguration/launch_configuration.go → ...rvice/autoscaling/launch_configuration.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package launchconfiguration
package autoscaling

import (
"fmt"
Expand Down
2 changes: 1 addition & 1 deletion ...ation/launch_configuration_data_source.go → ...aling/launch_configuration_data_source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package launchconfiguration
package autoscaling

import (
"github.com/NaverCloudPlatform/ncloud-sdk-go-v2/ncloud"
Expand Down
2 changes: 1 addition & 1 deletion .../launch_configuration_data_source_test.go → .../launch_configuration_data_source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package launchconfiguration_test
package autoscaling_test

import (
"fmt"
Expand Down
22 changes: 11 additions & 11 deletions ...onfiguration/launch_configuration_test.go → .../autoscaling/launch_configuration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package launchconfiguration_test
package autoscaling_test

import (
"fmt"
Expand All @@ -11,11 +11,11 @@ import (

. "github.com/terraform-providers/terraform-provider-ncloud/internal/acctest"
"github.com/terraform-providers/terraform-provider-ncloud/internal/conn"
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/launchconfiguration"
"github.com/terraform-providers/terraform-provider-ncloud/internal/service/autoscaling"
)

func TestAccResourceNcloudLaunchConfiguration_classic_basic(t *testing.T) {
var launchConfiguration launchconfiguration.LaunchConfiguration
var launchConfiguration autoscaling.LaunchConfiguration
resourceName := "ncloud_launch_configuration.lc"
serverImageProductCode := "SPSW0LINUX000046"
serverProductCode := "SPSVRSSD00000003"
Expand All @@ -42,7 +42,7 @@ func TestAccResourceNcloudLaunchConfiguration_classic_basic(t *testing.T) {
}

func TestAccResourceNcloudLaunchConfiguration_vpc_basic(t *testing.T) {
var launchConfiguration launchconfiguration.LaunchConfiguration
var launchConfiguration autoscaling.LaunchConfiguration
resourceName := "ncloud_launch_configuration.lc"
serverImageProductCode := "SW.VSVR.OS.LNX64.CNTOS.0703.B050"
resource.ParallelTest(t, resource.TestCase{
Expand All @@ -68,7 +68,7 @@ func TestAccResourceNcloudLaunchConfiguration_vpc_basic(t *testing.T) {
}

func TestAccResourceNcloudLaunchConfiguration_classic_disappears(t *testing.T) {
var launchConfiguration launchconfiguration.LaunchConfiguration
var launchConfiguration autoscaling.LaunchConfiguration
resourceName := "ncloud_launch_configuration.lc"
serverImageProductCode := "SPSW0LINUX000046"
serverProductCode := "SPSVRSSD00000003"
Expand All @@ -83,7 +83,7 @@ func TestAccResourceNcloudLaunchConfiguration_classic_disappears(t *testing.T) {
Config: testAccLaunchConfigurationConfig(serverImageProductCode, serverProductCode),
Check: resource.ComposeTestCheckFunc(
testAccCheckLaunchConfigurationExists(resourceName, &launchConfiguration, GetTestProvider(false)),
TestAccCheckResourceDisappears(GetTestProvider(false), launchconfiguration.ResourceNcloudLaunchConfiguration(), resourceName),
TestAccCheckResourceDisappears(GetTestProvider(false), autoscaling.ResourceNcloudLaunchConfiguration(), resourceName),
),
ExpectNonEmptyPlan: true,
},
Expand All @@ -92,7 +92,7 @@ func TestAccResourceNcloudLaunchConfiguration_classic_disappears(t *testing.T) {
}

func TestAccResourceNcloudLaunchConfiguration_vpc_disappears(t *testing.T) {
var launchConfiguration launchconfiguration.LaunchConfiguration
var launchConfiguration autoscaling.LaunchConfiguration
resourceName := "ncloud_launch_configuration.lc"
serverImageProductCode := "SW.VSVR.OS.LNX64.CNTOS.0703.B050"
resource.ParallelTest(t, resource.TestCase{
Expand All @@ -106,15 +106,15 @@ func TestAccResourceNcloudLaunchConfiguration_vpc_disappears(t *testing.T) {
Config: testAccLaunchConfigurationConfig(serverImageProductCode, ""),
Check: resource.ComposeTestCheckFunc(
testAccCheckLaunchConfigurationExists(resourceName, &launchConfiguration, GetTestProvider(true)),
TestAccCheckResourceDisappears(GetTestProvider(true), launchconfiguration.ResourceNcloudLaunchConfiguration(), resourceName),
TestAccCheckResourceDisappears(GetTestProvider(true), autoscaling.ResourceNcloudLaunchConfiguration(), resourceName),
),
ExpectNonEmptyPlan: true,
},
},
})
}

func testAccCheckLaunchConfigurationExists(n string, l *launchconfiguration.LaunchConfiguration, provider *schema.Provider) resource.TestCheckFunc {
func testAccCheckLaunchConfigurationExists(n string, l *autoscaling.LaunchConfiguration, provider *schema.Provider) resource.TestCheckFunc {
return func(s *terraform.State) error {
rs, ok := s.RootModule().Resources[n]
if !ok {
Expand All @@ -126,7 +126,7 @@ func testAccCheckLaunchConfigurationExists(n string, l *launchconfiguration.Laun
}

config := provider.Meta().(*conn.ProviderConfig)
launchConfiguration, err := launchconfiguration.GetLaunchConfiguration(config, rs.Primary.ID)
launchConfiguration, err := autoscaling.GetLaunchConfiguration(config, rs.Primary.ID)
if err != nil {
return err
}
Expand All @@ -145,7 +145,7 @@ func testAccCheckLaunchConfigurationDestroy(s *terraform.State, provider *schema
if rs.Type != "ncloud_launch_configuration" {
continue
}
launchConfiguration, err := launchconfiguration.GetClassicLaunchConfiguration(config, rs.Primary.ID)
launchConfiguration, err := autoscaling.GetClassicLaunchConfiguration(config, rs.Primary.ID)
if err != nil {
return err
}
Expand Down