Add PhysicalAddress and CapabilitiesManagedBySatellite to Terraform SatelliteLocation for both resource and data-source

go.mod

@@ -5,7 +5,7 @@ go 1.22.4
 toolchain go1.22.5
 
 require (
-	github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240216115622-a311507b4b5b
+	github.com/IBM-Cloud/container-services-go-sdk v0.0.0-20240725064144-454a2ae23113
 	github.com/IBM-Cloud/power-go-client v1.7.0
 	github.com/IBM/apigateway-go-sdk v0.0.0-20210714141226-a5d5d49caaca
 	github.com/IBM/appconfiguration-go-admin-sdk v0.3.0

ibm/flex/structures.go

@@ -19,10 +19,15 @@ import (
 	"strings"
 	"time"
 
+	"github.com/IBM-Cloud/bluemix-go/api/container/containerv1"
+	"github.com/IBM-Cloud/bluemix-go/api/container/containerv2"
+	"github.com/IBM-Cloud/bluemix-go/api/icd/icdv4"
+	"github.com/IBM-Cloud/bluemix-go/api/mccp/mccpv2"
+	"github.com/IBM-Cloud/bluemix-go/api/schematics"
+	"github.com/IBM-Cloud/bluemix-go/api/usermanagement/usermanagementv2"
 	"github.com/IBM-Cloud/bluemix-go/bmxerror"
 	"github.com/IBM-Cloud/bluemix-go/models"
 	"github.com/IBM-Cloud/container-services-go-sdk/kubernetesserviceapiv1"
-	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
 	"github.com/IBM/cloud-databases-go-sdk/clouddatabasesv5"
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/IBM/ibm-cos-sdk-go-config/v2/resourceconfigurationv1"
@@ -31,8 +36,11 @@ import (
 	kp "github.com/IBM/keyprotect-go-client"
 	"github.com/IBM/platform-services-go-sdk/globalsearchv2"
 	"github.com/IBM/platform-services-go-sdk/globaltaggingv1"
+	"github.com/IBM/platform-services-go-sdk/iamaccessgroupsv2"
+	"github.com/IBM/platform-services-go-sdk/iamidentityv1"
 	"github.com/IBM/platform-services-go-sdk/iampolicymanagementv1"
 	"github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
+	rc "github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
 	rg "github.com/IBM/platform-services-go-sdk/resourcemanagerv2"
 	"github.com/apache/openwhisk-client-go/whisk"
 	"github.com/go-openapi/strfmt"
@@ -41,15 +49,7 @@ import (
 	"github.com/softlayer/softlayer-go/datatypes"
 	"github.com/softlayer/softlayer-go/sl"
 
-	"github.com/IBM-Cloud/bluemix-go/api/container/containerv1"
-	"github.com/IBM-Cloud/bluemix-go/api/container/containerv2"
-	"github.com/IBM-Cloud/bluemix-go/api/icd/icdv4"
-	"github.com/IBM-Cloud/bluemix-go/api/mccp/mccpv2"
-	"github.com/IBM-Cloud/bluemix-go/api/schematics"
-	"github.com/IBM-Cloud/bluemix-go/api/usermanagement/usermanagementv2"
-	"github.com/IBM/platform-services-go-sdk/iamaccessgroupsv2"
-	"github.com/IBM/platform-services-go-sdk/iamidentityv1"
-	rc "github.com/IBM/platform-services-go-sdk/resourcecontrollerv2"
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
 )
 
 const (
@@ -4239,6 +4239,15 @@ func FlattenSatelliteHosts(hostList []kubernetesserviceapiv1.MultishiftQueueNode
 	return hosts
 }
 
+func FlattenSatelliteCapabilities(capabilities *schema.Set) []kubernetesserviceapiv1.CapabilityManagedBySatellite {
+	result := make([]kubernetesserviceapiv1.CapabilityManagedBySatellite, capabilities.Len())
+	for i, v := range capabilities.List() {
+		result[i] = kubernetesserviceapiv1.CapabilityManagedBySatellite(v.(string))
+	}
+
+	return result
+}
+
 func FlattenWorkerPoolHostLabels(hostLabels map[string]string) *schema.Set {
 	mapped := make([]string, 0)
 	for k, v := range hostLabels {

ibm/service/satellite/data_source_ibm_satellite_location.go

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2017, 2021 All Rights Reserved.
+// Copyright IBM Corp. 2017, 2024 All Rights Reserved.
 // Licensed under the Mozilla Public License v2.0
 
 package satellite
@@ -9,11 +9,12 @@ import (
 	"time"
 
 	"github.com/IBM-Cloud/container-services-go-sdk/kubernetesserviceapiv1"
-	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
-	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
 )
 
 func DataSourceIBMSatelliteLocation() *schema.Resource {
@@ -31,6 +32,18 @@ func DataSourceIBMSatelliteLocation() *schema.Resource {
 				Computed:    true,
 				Description: "The IBM Cloud metro from which the Satellite location is managed",
 			},
+			"physical_address": {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "An optional physical address of the new Satellite location which is deployed on premise",
+			},
+			"capabilities": {
+				Type:        schema.TypeSet,
+				Computed:    true,
+				Elem:        &schema.Schema{Type: schema.TypeString},
+				Set:         schema.HashString,
+				Description: "The satellite capabilities attached to the location",
+			},
 			"description": {
 				Type:        schema.TypeString,
 				Computed:    true,
@@ -166,6 +179,8 @@ func dataSourceIBMSatelliteLocationRead(d *schema.ResourceData, meta interface{}
 
 	var instance *kubernetesserviceapiv1.MultishiftGetController
 	var response *core.DetailedResponse
+	// TO-DO: resource.Retry, resource.RetryError, resource.RetryableError and resource.NonRetryableError
+	// seem to be deprecated. This shall be replaced.
 	err = resource.Retry(1*time.Minute, func() *resource.RetryError {
 		instance, response, err = satClient.GetSatelliteLocation(getSatLocOptions)
 		if err != nil || instance == nil {
@@ -187,6 +202,12 @@ func dataSourceIBMSatelliteLocationRead(d *schema.ResourceData, meta interface{}
 	d.SetId(*instance.ID)
 	d.Set("location", location)
 	d.Set("description", *instance.Description)
+	if instance.PhysicalAddress != nil {
+		d.Set("physical_address", *instance.PhysicalAddress)
+	}
+	if instance.CapabilitiesManagedBySatellite != nil {
+		d.Set("capabilities", instance.CapabilitiesManagedBySatellite)
+	}
 	if instance.CoreosEnabled != nil {
 		d.Set("coreos_enabled", *instance.CoreosEnabled)
 	}

ibm/service/satellite/data_source_ibm_satellite_location_nlb_dns_test.go

@@ -7,21 +7,25 @@ import (
 	"fmt"
 	"testing"
 
-	acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
-
+	"github.com/IBM-Cloud/container-services-go-sdk/kubernetesserviceapiv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
+	acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
 )
 
 func TestAccIBMSatelliteLocationNLBDNSListBasic(t *testing.T) {
 	name := fmt.Sprintf("tf-satellitelocation-%d", acctest.RandIntRange(10, 100))
 	managed_from := "wdc04"
+	physical_address := "test location address"
+	capabilities := []kubernetesserviceapiv1.CapabilityManagedBySatellite{kubernetesserviceapiv1.OnPrem}
+
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { acc.TestAccPreCheck(t) },
 		Providers: acc.TestAccProviders,
 		Steps: []resource.TestStep{
 			{
-				Config: testAccCheckIBMSatelliteLocationNLBDNSListConfig(name, managed_from),
+				Config: testAccCheckIBMSatelliteLocationNLBDNSListConfig(name, managed_from, physical_address, capabilities),
 				Check: resource.ComposeTestCheckFunc(
 					resource.TestCheckResourceAttrSet("data.ibm_satellite_location_nlb_dns.dns_list", "id"),
 				),
@@ -30,8 +34,8 @@ func TestAccIBMSatelliteLocationNLBDNSListBasic(t *testing.T) {
 	})
 }
 
-func testAccCheckIBMSatelliteLocationNLBDNSListConfig(name, managed_from string) string {
-	return testAccCheckSatelliteLocationDataSource(name, managed_from) + `
+func testAccCheckIBMSatelliteLocationNLBDNSListConfig(name, managed_from, physical_address string, capabilities []kubernetesserviceapiv1.CapabilityManagedBySatellite) string {
+	return testAccCheckSatelliteLocationDataSource(name, managed_from, physical_address, capabilities) + `
 	data ibm_satellite_location_nlb_dns dns_list {
 		location = ibm_satellite_location.location.id
 	}

ibm/service/satellite/data_source_ibm_satellite_location_test.go

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2017, 2021 All Rights Reserved.
+// Copyright IBM Corp. 2017, 2024 All Rights Reserved.
 // Licensed under the Mozilla Public License v2.0
 
 package satellite_test
@@ -7,45 +7,53 @@ import (
 	"fmt"
 	"testing"
 
-	acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
-
+	"github.com/IBM-Cloud/container-services-go-sdk/kubernetesserviceapiv1"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+
+	acc "github.com/IBM-Cloud/terraform-provider-ibm/ibm/acctest"
 )
 
 func TestAccSatelliteLocationDataSourceBasic(t *testing.T) {
 	name := fmt.Sprintf("tf-satellitelocation-%d", acctest.RandIntRange(10, 100))
 	managed_from := "wdc04"
+	physical_address := "test-road 10, 111 test-place, testcountry"
+	capabilities := []kubernetesserviceapiv1.CapabilityManagedBySatellite{kubernetesserviceapiv1.OnPrem}
 
 	resource.Test(t, resource.TestCase{
 		PreCheck:  func() { acc.TestAccPreCheck(t) },
 		Providers: acc.TestAccProviders,
 		Steps: []resource.TestStep{
 
 			{
-				Config: testAccCheckSatelliteLocationDataSource(name, managed_from),
+				Config: testAccCheckSatelliteLocationDataSource(name, managed_from, physical_address, capabilities),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr("ibm_satellite_location.location", "location", name),
 					resource.TestCheckResourceAttr("ibm_satellite_location.location", "managed_from", managed_from),
+					resource.TestCheckResourceAttr("ibm_satellite_location.location", "physical_address", physical_address),
+					resource.TestCheckResourceAttr("ibm_satellite_location.location", "capabilities.#", "1"),
+					resource.TestCheckResourceAttr("ibm_satellite_location.location", "capabilities.0", "on-prem"),
 				),
 			},
 		},
 	})
 }
 
-func testAccCheckSatelliteLocationDataSource(name, managed_from string) string {
+func testAccCheckSatelliteLocationDataSource(name, managed_from string, physical_address string, capabilities []kubernetesserviceapiv1.CapabilityManagedBySatellite) string {
 	return fmt.Sprintf(`
 
 	resource "ibm_satellite_location" "location" {
 		location      = "%s"
 		managed_from  = "%s"
+		physical_address = "%s"
 		description	  = "satellite service"	
 		zones		  = ["us-east-1", "us-east-2", "us-east-3"]
 		tags		  = ["env:dev"]
+		capabilities = %q
 	}
 
     data "ibm_satellite_location" "test_location" {
 		location              = ibm_satellite_location.location.id	
-}`, name, managed_from)
+}`, name, managed_from, physical_address, capabilities)
 
 }

ibm/service/satellite/resource_ibm_satellite_location.go

@@ -1,4 +1,4 @@
-// Copyright IBM Corp. 2017, 2021 All Rights Reserved.
+// Copyright IBM Corp. 2017, 2024 All Rights Reserved.
 // Licensed under the Mozilla Public License v2.0
 
 package satellite
@@ -11,13 +11,14 @@ import (
 	"time"
 
 	"github.com/IBM-Cloud/container-services-go-sdk/kubernetesserviceapiv1"
-	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
-	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
-	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate"
 	"github.com/IBM/go-sdk-core/v5/core"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/customdiff"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/conns"
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/flex"
+	"github.com/IBM-Cloud/terraform-provider-ibm/ibm/validate"
 )
 
 const (
@@ -93,6 +94,21 @@ func ResourceIBMSatelliteLocation() *schema.Resource {
 				},
 				Description: "The IBM Cloud metro from which the Satellite location is managed",
 			},
+			"physical_address": {
+				Type:             schema.TypeString,
+				DiffSuppressFunc: flex.ApplyOnce,
+				Optional:         true,
+				Description:      "An optional physical address of the new Satellite location which is deployed on premise",
+			},
+			"capabilities": {
+				Type:             schema.TypeSet,
+				DiffSuppressFunc: flex.ApplyOnce,
+				Optional:         true,
+				RequiredWith:     []string{"physical_address"},
+				Elem:             &schema.Schema{Type: schema.TypeString},
+				Set:              schema.HashString,
+				Description:      "The satellite capabilities attached to the location",
+			},
 			"description": {
 				Type:        schema.TypeString,
 				Optional:    true,
@@ -237,7 +253,24 @@ func ResourceIBMSatelliteLocationValidator() *validate.ResourceValidator {
 			Optional:                   true,
 			Regexp:                     `^[A-Za-z0-9:_ .-]+$`,
 			MinValueLength:             1,
-			MaxValueLength:             128})
+			MaxValueLength:             128,
+		},
+		validate.ValidateSchema{
+			Identifier:                 "physical_address",
+			ValidateFunctionIdentifier: validate.StringLenBetween,
+			Type:                       validate.TypeString,
+			Optional:                   true,
+			MinValueLength:             0,
+			MaxValueLength:             400,
+		},
+		validate.ValidateSchema{
+			Identifier:                 "capabilities",
+			ValidateFunctionIdentifier: validate.ValidateAllowedStringValue,
+			Type:                       validate.TypeString,
+			Optional:                   true,
+			AllowedValues:              "on-prem",
+		},
+	)
 
 	ibmSatelliteLocationValidator := validate.ResourceValidator{ResourceName: "ibm_satellite_location", Schema: validateSchema}
 	return &ibmSatelliteLocationValidator
@@ -272,6 +305,16 @@ func resourceIBMSatelliteLocationCreate(d *schema.ResourceData, meta interface{}
 		createSatLocOptions.LoggingAccountID = &logAccID
 	}
 
+	if v, ok := d.GetOk("physical_address"); ok {
+		addr := v.(string)
+		createSatLocOptions.PhysicalAddress = &addr
+	}
+
+	if v, ok := d.GetOk("capabilities"); ok {
+		z := v.(*schema.Set)
+		createSatLocOptions.CapabilitiesManagedBySatellite = flex.FlattenSatelliteCapabilities(z)
+	}
+
 	if v, ok := d.GetOk("description"); ok {
 		desc := v.(string)
 		createSatLocOptions.Description = &desc
@@ -351,6 +394,14 @@ func resourceIBMSatelliteLocationRead(d *schema.ResourceData, meta interface{})
 		d.Set("description", *instance.Description)
 	}
 
+	if instance.PhysicalAddress != nil {
+		d.Set("physical_address", *instance.PhysicalAddress)
+	}
+
+	if instance.CapabilitiesManagedBySatellite != nil {
+		d.Set("capabilities", instance.CapabilitiesManagedBySatellite)
+	}
+
 	if instance.CoreosEnabled != nil {
 		d.Set("coreos_enabled", *instance.CoreosEnabled)
 	}