-
Notifications
You must be signed in to change notification settings - Fork 1.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Promote gemini_* resources to ga (#12747)
Co-authored-by: Scott Suarez <[email protected]>
- Loading branch information
1 parent
2351a26
commit b5bdbf8
Showing
9 changed files
with
60 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 1 addition & 2 deletions
3
mmv1/templates/terraform/examples/gemini_code_repository_index_basic.tf.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,5 @@ | ||
resource "google_gemini_code_repository_index" "example" { | ||
provider = google-beta | ||
location = "us-central1" | ||
code_repository_index_id = "{{index $.Vars "cri_id"}}" | ||
code_repository_index_id = "code-repository-index-example" | ||
kms_key = "projects/projectExample/locations/locationExample/keyRings/keyRingExample/cryptoKeys/cryptoKeyExample" | ||
} |
3 changes: 1 addition & 2 deletions
3
mmv1/templates/terraform/examples/gemini_repository_group_basic.tf.tmpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,5 +1,4 @@ | ||
package gemini_test | ||
{{- if ne $.TargetVersionName "ga" }} | ||
|
||
import ( | ||
"fmt" | ||
|
@@ -22,18 +21,18 @@ func TestAccGeminiRepositoryGroupIamBinding(t *testing.T) { | |
repositoryGroupId := "tf-test-iam-repository-group-id-" + acctest.RandString(t, 10) | ||
|
||
context := map[string]interface{}{ | ||
"role": "roles/cloudaicompanion.repositoryGroupsUser", | ||
"code_repository_index": codeRepositoryIndexId, | ||
"location": location, | ||
"project": envvar.GetTestProjectFromEnv(), | ||
"connection_id": developerConnectionId, | ||
"git_link_id": gitRepositoryLinkId, | ||
"repository_group_id": repositoryGroupId, | ||
"role": "roles/cloudaicompanion.repositoryGroupsUser", | ||
"code_repository_index": codeRepositoryIndexId, | ||
"location": location, | ||
"project": envvar.GetTestProjectFromEnv(), | ||
"connection_id": developerConnectionId, | ||
"git_link_id": gitRepositoryLinkId, | ||
"repository_group_id": repositoryGroupId, | ||
} | ||
|
||
acctest.VcrTest(t, resource.TestCase{ | ||
PreCheck: func() { acctest.AccTestPreCheck(t) }, | ||
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), | ||
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), | ||
Steps: []resource.TestStep{ | ||
{ | ||
Config: testAccGeminiRepositoryGroupIamBinding_basic(context), | ||
|
@@ -66,18 +65,18 @@ func TestAccGeminiRepositoryGroupIamMember(t *testing.T) { | |
repositoryGroupId := "tf-test-iam-repository-group-id-" + acctest.RandString(t, 10) | ||
|
||
context := map[string]interface{}{ | ||
"role": "roles/cloudaicompanion.repositoryGroupsUser", | ||
"code_repository_index": codeRepositoryIndexId, | ||
"location": location, | ||
"project": envvar.GetTestProjectFromEnv(), | ||
"connection_id": developerConnectionId, | ||
"git_link_id": gitRepositoryLinkId, | ||
"repository_group_id": repositoryGroupId, | ||
"role": "roles/cloudaicompanion.repositoryGroupsUser", | ||
"code_repository_index": codeRepositoryIndexId, | ||
"location": location, | ||
"project": envvar.GetTestProjectFromEnv(), | ||
"connection_id": developerConnectionId, | ||
"git_link_id": gitRepositoryLinkId, | ||
"repository_group_id": repositoryGroupId, | ||
} | ||
|
||
acctest.VcrTest(t, resource.TestCase{ | ||
PreCheck: func() { acctest.AccTestPreCheck(t) }, | ||
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), | ||
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), | ||
Steps: []resource.TestStep{ | ||
{ | ||
// Test Iam Member creation (no update for member, no need to test) | ||
|
@@ -101,18 +100,18 @@ func TestAccGeminiRepositoryGroupIamPolicy(t *testing.T) { | |
repositoryGroupId := "tf-test-iam-repository-group-id-" + acctest.RandString(t, 10) | ||
|
||
context := map[string]interface{}{ | ||
"role": "roles/cloudaicompanion.repositoryGroupsUser", | ||
"code_repository_index": codeRepositoryIndexId, | ||
"location": location, | ||
"project": envvar.GetTestProjectFromEnv(), | ||
"connection_id": developerConnectionId, | ||
"git_link_id": gitRepositoryLinkId, | ||
"repository_group_id": repositoryGroupId, | ||
"role": "roles/cloudaicompanion.repositoryGroupsUser", | ||
"code_repository_index": codeRepositoryIndexId, | ||
"location": location, | ||
"project": envvar.GetTestProjectFromEnv(), | ||
"connection_id": developerConnectionId, | ||
"git_link_id": gitRepositoryLinkId, | ||
"repository_group_id": repositoryGroupId, | ||
} | ||
|
||
acctest.VcrTest(t, resource.TestCase{ | ||
PreCheck: func() { acctest.AccTestPreCheck(t) }, | ||
ProtoV5ProviderFactories: acctest.ProtoV5ProviderBetaFactories(t), | ||
ProtoV5ProviderFactories: acctest.ProtoV5ProviderFactories(t), | ||
Steps: []resource.TestStep{ | ||
{ | ||
Config: testAccGeminiRepositoryGroupIamPolicy_basic(context), | ||
|
@@ -140,7 +139,6 @@ func TestAccGeminiRepositoryGroupIamPolicy(t *testing.T) { | |
func testAccGeminiRepositoryGroupIamMember_basic(context map[string]interface{}) string { | ||
return acctest.Nprintf(` | ||
resource "google_gemini_repository_group_iam_member" "foo" { | ||
provider = google-beta | ||
project = "%{project}" | ||
location = "%{location}" | ||
code_repository_index = "%{code_repository_index}" | ||
|
@@ -150,7 +148,6 @@ resource "google_gemini_repository_group_iam_member" "foo" { | |
} | ||
|
||
resource "google_gemini_repository_group" "example" { | ||
provider = google-beta | ||
location = "us-central1" | ||
code_repository_index = "%{code_repository_index}" | ||
repository_group_id = "%{repository_group_id}" | ||
|
@@ -166,15 +163,13 @@ resource "google_gemini_repository_group" "example" { | |
func testAccGeminiRepositoryGroupIamPolicy_basic(context map[string]interface{}) string { | ||
return acctest.Nprintf(` | ||
data "google_iam_policy" "foo" { | ||
provider = google-beta | ||
binding { | ||
role = "%{role}" | ||
members = ["user:[email protected]"] | ||
} | ||
} | ||
|
||
resource "google_gemini_repository_group_iam_policy" "foo" { | ||
provider = google-beta | ||
project = "%{project}" | ||
location = "%{location}" | ||
code_repository_index = "%{code_repository_index}" | ||
|
@@ -183,7 +178,6 @@ resource "google_gemini_repository_group_iam_policy" "foo" { | |
} | ||
|
||
data "google_gemini_repository_group_iam_policy" "foo" { | ||
provider = google-beta | ||
project = "%{project}" | ||
location = "%{location}" | ||
code_repository_index = "%{code_repository_index}" | ||
|
@@ -194,7 +188,6 @@ data "google_gemini_repository_group_iam_policy" "foo" { | |
} | ||
|
||
resource "google_gemini_repository_group" "example" { | ||
provider = google-beta | ||
location = "us-central1" | ||
code_repository_index = "%{code_repository_index}" | ||
repository_group_id = "%{repository_group_id}" | ||
|
@@ -210,11 +203,9 @@ resource "google_gemini_repository_group" "example" { | |
func testAccGeminiRepositoryGroupIamPolicy_emptyBinding(context map[string]interface{}) string { | ||
return acctest.Nprintf(` | ||
data "google_iam_policy" "foo" { | ||
provider = google-beta | ||
} | ||
|
||
resource "google_gemini_repository_group_iam_policy" "foo" { | ||
provider = google-beta | ||
project = "%{project}" | ||
location = "%{location}" | ||
code_repository_index = "%{code_repository_index}" | ||
|
@@ -223,7 +214,6 @@ resource "google_gemini_repository_group_iam_policy" "foo" { | |
} | ||
|
||
resource "google_gemini_repository_group" "example" { | ||
provider = google-beta | ||
location = "us-central1" | ||
code_repository_index = "%{code_repository_index}" | ||
repository_group_id = "%{repository_group_id}" | ||
|
@@ -239,7 +229,6 @@ resource "google_gemini_repository_group" "example" { | |
func testAccGeminiRepositoryGroupIamBinding_basic(context map[string]interface{}) string { | ||
return acctest.Nprintf(` | ||
resource "google_gemini_repository_group_iam_binding" "foo" { | ||
provider = google-beta | ||
project = "%{project}" | ||
location = "%{location}" | ||
code_repository_index = "%{code_repository_index}" | ||
|
@@ -249,7 +238,6 @@ resource "google_gemini_repository_group_iam_binding" "foo" { | |
} | ||
|
||
resource "google_gemini_repository_group" "example" { | ||
provider = google-beta | ||
location = "us-central1" | ||
code_repository_index = "%{code_repository_index}" | ||
repository_group_id = "%{repository_group_id}" | ||
|
@@ -265,7 +253,6 @@ resource "google_gemini_repository_group" "example" { | |
func testAccGeminiRepositoryGroupIamBinding_update(context map[string]interface{}) string { | ||
return acctest.Nprintf(` | ||
resource "google_gemini_repository_group_iam_binding" "foo" { | ||
provider = google-beta | ||
project = "%{project}" | ||
location = "%{location}" | ||
code_repository_index = "%{code_repository_index}" | ||
|
@@ -275,7 +262,6 @@ resource "google_gemini_repository_group_iam_binding" "foo" { | |
} | ||
|
||
resource "google_gemini_repository_group" "example" { | ||
provider = google-beta | ||
location = "us-central1" | ||
code_repository_index = "%{code_repository_index}" | ||
repository_group_id = "%{repository_group_id}" | ||
|
@@ -287,4 +273,3 @@ resource "google_gemini_repository_group" "example" { | |
} | ||
`, context) | ||
} | ||
{{ end }} |
Oops, something went wrong.