Skip to content

Fixing broken dbsystem test #16624

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
roaks3 merged 1 commit into from
Mar 12, 2026
+6 −1
Merged

Fixing broken dbsystem test #16624

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions mmv1/products/oracledatabase/DbSystem.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
name: DbSystem

Check warning on line 13 in mmv1/products/oracledatabase/DbSystem.yaml

View workflow job for this annotation

GitHub Actions / lint-yaml 

13:1 [document-start] missing document start "---"
description: A DbSystem Resource
base_url: projects/{{project}}/locations/{{location}}/dbSystems
immutable: true
Expand All @@ -30,6 +30,7 @@
project: 'my-project'
db_system_id: 'my-instance'
database_id: 'mydb'
db_unique_name: 'db'
odb_network: 'projects/my-project/locations/europe-west2/odbNetworks/my-odbnetwork'
odb_subnet: 'projects/my-project/locations/europe-west2/odbNetworks/my-odbnetwork/odbSubnets/my-odbsubnet'
deletion_protection: 'true'
Expand All @@ -44,6 +45,7 @@
# See: https://github.com/hashicorp/terraform-provider-google/issues/20599
db_system_id: 'fmt.Sprintf("ofake-tf-test-dbsystem-basic-%s", acctest.RandString(t, 10))'
database_id: 'fmt.Sprintf("ofake-tf-test-database-basic-%s", acctest.RandString(t, 10))'
db_unique_name: 'fmt.Sprintf("db%s", acctest.RandString(t, 10))'
odb_network: '"projects/oci-terraform-testing-prod/locations/europe-west2/odbNetworks/tf-test-permanent-odbnetwork"'
odb_subnet: '"projects/oci-terraform-testing-prod/locations/europe-west2/odbNetworks/tf-test-permanent-odbnetwork/odbSubnets/tf-test-permanent-client-odbsubnet"'
- name: 'oracledatabase_db_system_full'
Expand All @@ -52,6 +54,7 @@
project: 'my-project'
db_system_id: 'my-instance'
database_id: 'mydb'
db_unique_name: 'db'
odb_network: 'projects/my-project/locations/europe-west2/odbNetworks/my-odbnetwork'
odb_subnet: 'projects/my-project/locations/europe-west2/odbNetworks/my-odbnetwork/odbSubnets/my-odbsubnet'
deletion_protection: 'true'
Expand All @@ -66,6 +69,7 @@
# See: https://github.com/hashicorp/terraform-provider-google/issues/20599
db_system_id: 'fmt.Sprintf("ofake-tf-test-dbsystem-basic-%s", acctest.RandString(t, 10))'
database_id: 'fmt.Sprintf("ofake-tf-test-database-basic-%s", acctest.RandString(t, 10))'
db_unique_name: 'fmt.Sprintf("db%s", acctest.RandString(t, 10))'
odb_network: '"projects/oci-terraform-testing-prod/locations/europe-west2/odbNetworks/tf-test-permanent-odbnetwork"'
odb_subnet: '"projects/oci-terraform-testing-prod/locations/europe-west2/odbNetworks/tf-test-permanent-odbnetwork/odbSubnets/tf-test-permanent-client-odbsubnet"'
virtual_fields:
Expand Down
1 change: 1 addition & 0 deletions mmv1/templates/terraform/examples/oracledatabase_db_system_basic.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ resource "google_oracle_database_db_system" "{{$.PrimaryResourceId}}"{
admin_password = "ABcde_1#234"
database_id = "{{index $.Vars "database_id"}}"
db_name = "db"
db_unique_name = "{{index $.Vars "db_unique_name"}}"
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion mmv1/templates/terraform/examples/oracledatabase_db_system_full.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ resource "google_oracle_database_db_system" "{{$.PrimaryResourceId}}"{
db_version = "19.0.0.0"
database {
db_name = "db"
db_unique_name = "dbunique"
db_unique_name = "{{index $.Vars "db_unique_name"}}"
admin_password = "ABcde_1#2345"
tde_wallet_password = "ABcde_1#2345"
database_id = "{{index $.Vars "database_id"}}"
Expand Down
Loading