Skip to content

Commit

Permalink
remove project_id from application credentials
Browse files Browse the repository at this point in the history
  • Loading branch information
nrobert13 committed Jul 4, 2024
1 parent 9f21856 commit 686c897
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 15 deletions.
2 changes: 1 addition & 1 deletion metakube/resource_cluster_role_binding_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestAccMetakubeClusterRoleBinding(t *testing.T) {
t.Parallel()
resourceName := "metakube_cluster_role_binding.acctest"
params := &testAccCheckMetaKubeClusterRoleBindingBasicParams{
ClusterName: randomName("testacc", 5),
ClusterName: makeRandomName() + "-cluster-role-binding",
DatacenterName: os.Getenv(testEnvOpenstackNodeDC),
ProjectID: os.Getenv(testEnvProjectID),
Version: os.Getenv(testEnvK8sVersionOpenstack),
Expand Down
15 changes: 6 additions & 9 deletions metakube/resource_cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,8 @@ resource "metakube_cluster" "acctest_cluster" {
cloud {
openstack {
application_credentials {
project_id = "{{ .OpenstackProjectID }}"
application_credential_id = "{{ .OpenstackApplicationCredentialsID }}"
application_credential_secret = "{{ .OpenstackApplicationCredentialsSecret }}"
id = "{{ .OpenstackApplicationCredentialsID }}"
secret = "{{ .OpenstackApplicationCredentialsSecret }}"
}
floating_ip_pool = "ext-net"
security_group = openstack_networking_secgroup_v2.cluster-net.name
Expand Down Expand Up @@ -614,9 +613,8 @@ resource "metakube_cluster" "acctest_cluster" {
cloud {
openstack {
application_credentials {
project_id = "{{ .OpenstackProjectID }}"
application_credential_id = "{{ .OpenstackApplicationCredentialsID }}"
application_credential_secret = "{{ .OpenstackApplicationCredentialsSecret }}"
id = "{{ .OpenstackApplicationCredentialsID }}"
secret = "{{ .OpenstackApplicationCredentialsSecret }}"
}
floating_ip_pool = "ext-net"
}
Expand Down Expand Up @@ -646,9 +644,8 @@ resource "metakube_cluster" "acctest_cluster" {
cloud {
openstack {
application_credentials {
project_id = "{{ .OpenstackProjectID }}"
application_credential_id = "{{ .OpenstackApplicationCredentialsID }}"
application_credential_secret = "{{ .OpenstackApplicationCredentialsSecret }}"
id = "{{ .OpenstackApplicationCredentialsID }}"
secret = "{{ .OpenstackApplicationCredentialsSecret }}"
}
floating_ip_pool = "ext-net"
}
Expand Down
2 changes: 1 addition & 1 deletion metakube/resource_maintenance_cronjob_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ func TestAccMetakubeCluster_MaintenanceCronJob_Basic(t *testing.T) {

resourceName := "metakube_maintenance_cron_job.acctest"
params := &testAccCheckMetaKubeMaintenanceCronJobBasicParams{
ClusterName: randomName("testacc", 5),
ClusterName: makeRandomName() + "-maint-cron-job",
DatacenterName: os.Getenv(testEnvOpenstackNodeDC),
ProjectID: os.Getenv(testEnvProjectID),
Version: os.Getenv(testEnvK8sVersionOpenstack),
Expand Down
5 changes: 2 additions & 3 deletions metakube/resource_node_deployment_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -189,9 +189,8 @@ var nodeDeploymentBasicTemplate = mustParseTemplate("nodeDeploymentBasic", `
cloud {
openstack {
application_credentials {
project_id = "{{ .OpenstackProjectID }}"
application_credential_id = "{{ .OpenstackApplicationCredentialsID }}"
application_credential_secret = "{{ .OpenstackApplicationCredentialsSecret }}"
id = "{{ .OpenstackApplicationCredentialsID }}"
secret = "{{ .OpenstackApplicationCredentialsSecret }}"
}
floating_ip_pool = "ext-net"
}
Expand Down
2 changes: 1 addition & 1 deletion metakube/resource_role_binding_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ func TestAccMetakubeRoleBinding(t *testing.T) {
t.Parallel()
resourceName := "metakube_role_binding.acctest"
params := &testAccCheckMetaKubeRoleBindingBasicParams{
ClusterName: randomName("testacc", 5),
ClusterName: makeRandomName() + "-role-binding",
DatacenterName: os.Getenv(testEnvOpenstackNodeDC),
ProjectID: os.Getenv(testEnvProjectID),
Version: os.Getenv(testEnvK8sVersionOpenstack),
Expand Down

0 comments on commit 686c897

Please sign in to comment.