Skip to content

Commit cb74786

Browse files
author
mathieu prigent
committed
first review
1 parent a93f24a commit cb74786

5 files changed

+19
-5
lines changed

ovh/data_cloud_project_kube_oidc.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func dataSourceCloudProjectKubeOIDCRead(d *schema.ResourceData, meta interface{}
8484
endpoint := fmt.Sprintf("/cloud/project/%s/kube/%s/openIdConnect", serviceName, kubeId)
8585
res := &CloudProjectKubeOIDCResponse{}
8686

87-
log.Printf("[DEBUG] Will read oidc from kube %s and project: %s", kubeId, serviceName)
87+
log.Printf("[DEBUG] Will read OIDC from kube %s and project: %s", kubeId, serviceName)
8888
err := config.OVHClient.Get(endpoint, res)
8989
if err != nil {
9090
return fmt.Errorf("calling get %s %w", endpoint, err)
@@ -96,6 +96,6 @@ func dataSourceCloudProjectKubeOIDCRead(d *schema.ResourceData, meta interface{}
9696
}
9797
d.SetId(kubeId + "-" + res.ClientID + "-" + res.IssuerUrl)
9898

99-
log.Printf("[DEBUG] Read oidc %+v", res)
99+
log.Printf("[DEBUG] Read OIDC %+v", res)
100100
return nil
101101
}

ovh/data_cloud_project_kube_oidc_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestAccCloudProjectKubeOIDCDataSource_basic(t *testing.T) {
3030
Config: config,
3131
Check: resource.ComposeTestCheckFunc(
3232
resource.TestCheckResourceAttr(
33-
"data.ovh_cloud_project_kube_oidc.oidcData", "client_id", "toto"),
33+
"data.ovh_cloud_project_kube_oidc.oidcData", "client_id", "my-oidc-client-id"),
3434
resource.TestCheckResourceAttr(
3535
"data.ovh_cloud_project_kube_oidc.oidcData", "issuer_url", "https://www.ovhcloud.com/fr/"),
3636
resource.TestCheckResourceAttr(
@@ -66,7 +66,7 @@ resource "ovh_cloud_project_kube_oidc" "oidc" {
6666
service_name = ovh_cloud_project_kube.cluster.service_name
6767
kube_id = ovh_cloud_project_kube.cluster.id
6868
69-
client_id = "toto"
69+
client_id = "my-oidc-client-id"
7070
issuer_url = "https://www.ovhcloud.com/fr/"
7171
oidc_username_claim = "usrClaim"
7272
oidc_username_prefix = "usrPrefix"

ovh/resource_cloud_project_kube_oidc.go

+3
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ func resourceCloudProjectKubeOIDC() *schema.Resource {
1313
Read: resourceCloudProjectKubeOIDCRead,
1414
Delete: resourceCloudProjectKubeOIDCDelete,
1515
Update: resourceCloudProjectKubeOIDCUpdate,
16+
Importer: &schema.ResourceImporter{
17+
State: schema.ImportStatePassthrough,
18+
},
1619

1720
Schema: map[string]*schema.Schema{
1821
"service_name": {

website/docs/d/cloud_project_kube_oidc.html.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ data "ovh_cloud_project_kube_oidc" "oidc" {
1919
}
2020
2121
output "oidc-val" {
22-
value = data.ovh_cloud_project_kube_iprestrictions.oidc.client_id
22+
value = data.ovh_cloud_project_kube_oidc.oidc.client_id
2323
}
2424
```
2525

website/docs/r/cloud_project_kube_oidc.html.markdown

+11
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,19 @@ Creates an OIDC configuration in an OVHcloud Managed Kubernetes cluster.
1616
resource "ovh_cloud_project_kube_oidc" "my-oidc" {
1717
service_name = var.projectid
1818
kube_id = ovh_cloud_project_kube.mykube.id
19+
20+
#required field
1921
client_id = "xxx"
2022
issuer_url = "https://ovh.com"
23+
24+
#optional field
25+
oidc_username_claim = "email"
26+
oidc_username_prefix = "ovh:"
27+
oidc_groups_claim = ["groups"]
28+
oidc_groups_prefix = "ovh:"
29+
oidc_required_claim = ["claim1=val1"]
30+
oidc_signing_algs = ["RS512"]
31+
oidc_ca_content = "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUZhekNDQTFPZ0F3SUJBZ0lVYm9YRkZrL1hCQmdQUUI4UHlqbkttUGVWekNjd0RRWUpLb1pJaHZjTkFRRUwKQlFBd1JURUxNQWtHQTFVRUJoTUNRVlV4RXpBUkJnTlZCQWdNQ2xOdmJXVXRVM1JoZEdVeElUQWZCZ05WQkFvTQpHRWx1ZEdWeWJtVjBJRmRwWkdkcGRITWdVSFI1SUV4MFpEQWVGdzB5TWpFd01UUXdOalE0TlROYUZ3MHlNekV3Ck1UUXdOalE0TlROYU1FVXhDekFKQmdOVkJBWVRBa0ZWTVJNd0VRWURWUVFJREFwVGIyMWxMVk4wWVhSbE1TRXcKSHdZRFZRUUtEQmhKYm5SbGNtNWxkQ0JYYVdSbmFYUnpJRkIwZVNCTWRHUXdnZ0lpTUEwR0NTcUdTSWIzRFFFQgpBUVVBQTRJQ0R3QXdnZ0lLQW9JQ0FRQytPMk53bGx2QTQyT05SUHMyZWlqTUp2UHhpN21RblVSS3FrOHJEV1VkCkwzZU0yM1JXeVhtS1AydDQ5Zi9LVGsweEZNVStOSTUzTEhwWmh6N3NpK3dEUFUvWWZWSS9rQmZsRm8zeVZCMSsKZWdCSnpyNGIrQ3FoaWlCUkh0Vm5LblFKUmdvOVJjVkxhRm82UEY0N1V0UWJ2bWVuNGdERnExVkYwVHhUdnFMdwpIMzRZL0U2QUJsSlZnWFBzaWQzNm54eTErNnlKV05vRXNVekFiekpWMHhzTGhxc2hOazA0TWx4YnBhcG1XcEUxCmFFMHRIZGpjUlI3Y1dTRUUwMnRSQzNYL2tSNjBKb3MxR0N0Y0ZQTTVIN3NjOFBXNFRUem1EWWhOeDRiVjV4T28KU0xYRnI5ajBzZEgxbm1wSlI1dWxJT2dPTWV3MHA2d3JOYVV2MGpxc1hzdVdqMVpxdTRLRi81aEQ3azVhRlhKNQpjYWNTUi9mRWxreW1uZis0eHZFOG8wdkRWNFR5NHo3K3lSS1U0clZvZFNBZWZIN3lqeitLV1RRck96L0lHU2NwCmV1YTdqV0hRMDdMYWxyTjV2b0tFaU1JM3MrWjhzeUdVUGVyYXQwdzJMWlc3NnhxVGl4R002clZxUldxVlQ4L1oKQTJMMEc4WGRvNTZvV2lFYVF5RkJtRDFnMXU2UEsvTmFGVDI1L2tTNWJ1dnF5L1dLVGt0UVNhNHNZc1ZLbUlQTQp0Zys0NUZ2aFErNkRuQzd0TmVnaTZDTkdTb0w0R1dPOEE5UDZRNjE5RkJJZ1VjcGpFMTgvUHpQOEJmcTAxajhnCjZmdm1jNkVPMkxHVHhDcW1DbVp0TnI3OCtQaUxkMHZIY3pqY3E3NzhiNW5WRXRpUVNRQkUyb0ozTVlIZUFIUUkKYVFJREFRQUJvMU13VVRBZEJnTlZIUTRFRmdRVUpaMUhlVmx1U3pjY0U2NEZQYWtuNkRBWnhmSXdId1lEVlIwagpCQmd3Rm9BVUpaMUhlVmx1U3pjY0U2NEZQYWtuNkRBWnhmSXdEd1lEVlIwVEFRSC9CQVV3QXdFQi96QU5CZ2txCmhraUc5dzBCQVFzRkFBT0NBZ0VBQlhNSlU2MjJZVFZVNnZ1K2svNnkwMGNaWlRmVnZtdVJMOXhTcWxVM0I1QmQKVWdyVWx1TmdjN2dhUUlrYzkvWmh2MnhNd0xxUldMWEhiTWx1NkNvdkNiVTVpeWt0NHVWMnl5UzlZYWhmVVRNVQo3TVE0WFRta2hoS0dGbWZBQ2QzTUVwRE55T3hmWXh0UVBwM1NZT2IxRGFKMmUwY01Gc081bytORGQ5aFVBVzFoCjFLMjMwQnZzYldYYVo4MStIdTU4U1BsYTM5R3FMTG85MzR6dEs4WkRWNFRGTVJxMnNVQ1cxcWFidDh5ejd2RzAKSGV3dXdxelRwR1lTSFI1U0ZvMm45R0xKVUN4SnhxcDlOWVJjMlhUdXRUdkJESzVPMXFZZEJaQzd6cmcxSnczawp2SjI4UGx2TzBQRE42ZVlUdElJdC9yU05ZbW56eVVNRTRYREt0di9KRitLZWZNSWxDTkpzZDRHYXVTdlo5M1NOClhINmcrNEZvRkp4UzNxRmZ0WEc4czNRNnppNzNLRzh5UHZVNHU0WmZNRGd2aG92L0V5YkNLWUpFdVVZSlJWNGEKbmc3cWh3NDBabXQ0eWNCRzU5a2tFSGhNYWtxTWpPaUNkV2x4MEVjZXIxcEFGT1pqN3o1NktURXIxa0ZwUHVaRApjVER5SnNwTjh6dm9CQ0l1ancvQjR6S3kyWStOQitRR1p3dXhyTk9mRGR6ek9yQUE1Ym9OS2gwUUh4c0RxNTExClFaU3hCR21EcGJzN2QzMUQvQll3WEhIUWdwb3FoVUU5dFBGSThpN0pkM2FyeXZCdHlnTWlxSmt1VlRFVk1Ta0UKNTZ0VnFsMjlXenFhRXNrbDN3VUlmczVKKzN3RzRPcWNxRDdXaGQxWUtnc0VUMjdFTWlqVXZIYzQ4TXE0bU1rPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg=="
2132
}
2233
```
2334

0 commit comments

Comments
 (0)