fix import kube oidc

Author: mathieu prigent

ovh/resource_cloud_project_kube_oidc.go

@@ -3,6 +3,7 @@ package ovh
 import (
 	"fmt"
 	"log"
+	"strings"
 
 	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
 )
@@ -14,7 +15,7 @@ func resourceCloudProjectKubeOIDC() *schema.Resource {
 		Delete: resourceCloudProjectKubeOIDCDelete,
 		Update: resourceCloudProjectKubeOIDCUpdate,
 		Importer: &schema.ResourceImporter{
-			State: schema.ImportStatePassthrough,
+			State: resourceCloudProjectKubeOIDCImportState,
 		},
 
 		Schema: map[string]*schema.Schema{
@@ -79,6 +80,23 @@ func resourceCloudProjectKubeOIDC() *schema.Resource {
 	}
 }
 
+func resourceCloudProjectKubeOIDCImportState(d *schema.ResourceData, meta interface{}) ([]*schema.ResourceData, error) {
+	givenId := d.Id()
+	splitId := strings.SplitN(givenId, "/", 3)
+	if len(splitId) != 2 {
+		return nil, fmt.Errorf("Import Id is not service_name/kubeid formatted")
+	}
+	serviceName := splitId[0]
+	kubeId := splitId[1]
+	d.SetId(kubeId)
+	d.Set("kube_id", kubeId)
+	d.Set("service_name", serviceName)
+
+	results := make([]*schema.ResourceData, 1)
+	results[0] = d
+	return results, nil
+}
+
 func resourceCloudProjectKubeOIDCCreate(d *schema.ResourceData, meta interface{}) error {
 	config := meta.(*Config)
 
@@ -95,7 +113,7 @@ func resourceCloudProjectKubeOIDCCreate(d *schema.ResourceData, meta interface{}
 		return fmt.Errorf("calling Post %s with params %s:\n\t %w", endpoint, params, err)
 	}
 
-	d.SetId(kubeID + "-" + params.ClientID + "-" + params.IssuerUrl)
+	d.SetId(serviceName + "/" + kubeID)
 
 	log.Printf("[DEBUG] Waiting for kube %s to be READY", kubeID)
 	err = waitForCloudProjectKubeReady(config.OVHClient, serviceName, kubeID, []string{"REDEPLOYING"}, []string{"READY"})
@@ -125,7 +143,7 @@ func resourceCloudProjectKubeOIDCRead(d *schema.ResourceData, meta interface{})
 		if k != "id" {
 			d.Set(k, v)
 		} else {
-			d.SetId(kubeID + "-" + res.ClientID + "-" + res.IssuerUrl)
+			d.SetId(serviceName + "/" + kubeID)
 		}
 	}
 

ovh/types_iploadbalancing.go

@@ -246,7 +246,7 @@ func (opts *IPLoadbalancingHttpRouteActionOpts) FromResource(d *schema.ResourceD
 	return opts
 }
 
-//IPLoadbalancingHttpRoute HTTP Route
+// IPLoadbalancingHttpRoute HTTP Route
 type IPLoadbalancingHttpRouteOpts struct {
 	Action      IPLoadbalancingHttpRouteActionOpts `json:"action"`                //Action triggered when all rules match
 	DisplayName *string                            `json:"displayName,omitempty"` //Human readable name for your route, this field is for you
@@ -291,7 +291,7 @@ func (v IPLoadbalancingHttpRouteAction) ToMap() map[string]interface{} {
 	return obj
 }
 
-//IPLoadbalancingHttpRoute HTTP Route
+// IPLoadbalancingHttpRoute HTTP Route
 type IPLoadbalancingHttpRoute struct {
 	Action      IPLoadbalancingHttpRouteAction `json:"action"`      //Action triggered when all rules match
 	DisplayName *string                        `json:"displayName"` //Human readable name for your route, this field is for you
@@ -341,7 +341,7 @@ func (opts *IPLoadbalancingTcpRouteActionOpts) FromResource(d *schema.ResourceDa
 	return opts
 }
 
-//IPLoadbalancingTcpRoute HTTP Route
+// IPLoadbalancingTcpRoute HTTP Route
 type IPLoadbalancingTcpRouteOpts struct {
 	Action      IPLoadbalancingTcpRouteActionOpts `json:"action"`                //Action triggered when all rules match
 	DisplayName *string                           `json:"displayName,omitempty"` //Human readable name for your route, this field is for you
@@ -381,7 +381,7 @@ func (v IPLoadbalancingTcpRouteAction) ToMap() map[string]interface{} {
 	return obj
 }
 
-//IPLoadbalancingTcpRoute HTTP Route
+// IPLoadbalancingTcpRoute HTTP Route
 type IPLoadbalancingTcpRoute struct {
 	Action      IPLoadbalancingTcpRouteAction `json:"action"`      //Action triggered when all rules match
 	DisplayName *string                       `json:"displayName"` //Human readable name for your route, this field is for you
@@ -419,7 +419,7 @@ func (v IPLoadbalancingTcpRoute) ToMap() map[string]interface{} {
 	return obj
 }
 
-//IPLoadbalancingRouteRule Route Rule
+// IPLoadbalancingRouteRule Route Rule
 type IPLoadbalancingRouteRule struct {
 	DisplayName *string `json:"displayName"` //Human readable name for your rule
 	Field       string  `json:"field"`       //Name of the field to match like "protocol" or "host". See "/ipLoadbalancing/{serviceName}/availableRouteRules" for a list of available rules
@@ -468,7 +468,7 @@ func (v IPLoadbalancingRouteRule) ToMapForRoutes() map[string]interface{} {
 	return obj
 }
 
-//IPLoadbalancingRouteRule Route Rule
+// IPLoadbalancingRouteRule Route Rule
 type IPLoadbalancingRouteRuleOpts struct {
 	DisplayName *string `json:"displayName,omitempty"` //Human readable name for your rule
 	Field       string  `json:"field"`                 //Name of the field to match like "protocol" or "host". See "/ipLoadbalancing/{serviceName}/availableRouteRules" for a list of available rules

website/docs/r/cloud_project_kube_oidc.html.markdown

@@ -58,3 +58,11 @@ The following arguments are supported:
 * `oidcSigningAlgs` - Array of signing algorithms accepted. Default is `RS256`.
 
 * `oidcCaContent` - Content of the certificate for the CA, in Base64 format, that signed your identity provider's web certificate. Defaults to the host's root CAs.
+
+## Import
+
+OVHcloud Managed Kubernetes Service cluster OIDC can be imported using the tenant `service_name` and cluster id `kube_id` separated by "/" E.g.,
+
+```bash
+$ terraform import ovh_cloud_project_kube_oidc.my-oidc service_name/kube_id
+```