Skip to content
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.

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

feat: datastream sql server connection profile/stream from beta to GA #11159

Merged
merged 1 commit into from
Jul 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions mmv1/products/datastream/ConnectionProfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ examples:
skip_test: true
- !ruby/object:Provider::Terraform::Examples
name: 'datastream_connection_profile_sql_server'
min_version: beta
primary_resource_id: 'default'
skip_test: true
vars:
Expand Down Expand Up @@ -321,7 +320,6 @@ properties:
Database for the PostgreSQL connection.
- !ruby/object:Api::Type::NestedObject
name: 'sqlServerProfile'
min_version: beta
exactly_one_of:
- oracle_profile
- gcs_profile
Expand Down
3 changes: 0 additions & 3 deletions mmv1/products/datastream/Stream.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ examples:
destination_connection_profile_id: 'destination-profile'
- !ruby/object:Provider::Terraform::Examples
name: 'datastream_stream_sql_server'
min_version: beta
primary_resource_id: 'default'
skip_test: true
vars:
Expand Down Expand Up @@ -813,7 +812,6 @@ properties:
function: 'validation.IntAtLeast(0)'
- !ruby/object:Api::Type::NestedObject
name: 'sqlServerSourceConfig'
min_version: beta
allow_empty_object: true
send_empty_value: true
exactly_one_of:
Expand Down Expand Up @@ -1417,7 +1415,6 @@ properties:
The ordinal position of the column in the table.
- !ruby/object:Api::Type::NestedObject
name: 'sqlServerExcludedObjects'
min_version: beta
description: |
SQL Server data source objects to avoid backfilling.
properties:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_sql_database_instance" "instance" {
provider = google-beta
name = "<%= ctx[:vars]['sql_server_name'] %>"
database_version = "SQLSERVER_2019_STANDARD"
region = "us-central1"
Expand Down Expand Up @@ -35,20 +34,17 @@ resource "google_sql_database_instance" "instance" {
}

resource "google_sql_database" "db" {
provider = google-beta
name = "<%= ctx[:vars]['database_name'] %>"
instance = google_sql_database_instance.instance.name
}

resource "google_sql_user" "user" {
provider = google-beta
name = "<%= ctx[:vars]['database_user'] %>"
instance = google_sql_database_instance.instance.name
password = "<%= ctx[:vars]['database_password'] %>"
}

resource "google_datastream_connection_profile" "default" {
provider = google-beta
display_name = "SQL Server Source"
location = "us-central1"
connection_profile_id = "<%= ctx[:vars]['source_connection_profile_id'] %>"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_sql_database_instance" "instance" {
provider = google-beta
name = "<%= ctx[:vars]['sql_server_name'] %>"
database_version = "SQLSERVER_2019_STANDARD"
region = "us-central1"
Expand Down Expand Up @@ -35,21 +34,18 @@ resource "google_sql_database_instance" "instance" {
}

resource "google_sql_database" "db" {
provider = google-beta
name = "<%= ctx[:vars]['database_name'] %>"
instance = google_sql_database_instance.instance.name
depends_on = [google_sql_user.user]
}

resource "google_sql_user" "user" {
provider = google-beta
name = "<%= ctx[:vars]['database_user'] %>"
instance = google_sql_database_instance.instance.name
password = "<%= ctx[:vars]['database_password'] %>"
}

resource "google_datastream_connection_profile" "source" {
provider = google-beta
display_name = "SQL Server Source"
location = "us-central1"
connection_profile_id = "<%= ctx[:vars]['source_connection_profile_id'] %>"
Expand All @@ -64,7 +60,6 @@ resource "google_datastream_connection_profile" "source" {
}

resource "google_datastream_connection_profile" "destination" {
provider = google-beta
display_name = "BigQuery Destination"
location = "us-central1"
connection_profile_id = "<%= ctx[:vars]['destination_connection_profile_id'] %>"
Expand All @@ -73,7 +68,6 @@ resource "google_datastream_connection_profile" "destination" {
}

resource "google_datastream_stream" "default" {
provider = google-beta
display_name = "SQL Server to BigQuery"
location = "us-central1"
stream_id = "<%= ctx[:vars]['stream_id'] %>"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_sql_database_instance" "instance" {
provider = google-beta
name = "{{index $.Vars "sql_server_name"}}"
database_version = "SQLSERVER_2019_STANDARD"
region = "us-central1"
Expand Down Expand Up @@ -35,20 +34,17 @@ resource "google_sql_database_instance" "instance" {
}

resource "google_sql_database" "db" {
provider = google-beta
name = "{{index $.Vars "database_name"}}"
instance = google_sql_database_instance.instance.name
}

resource "google_sql_user" "user" {
provider = google-beta
name = "{{index $.Vars "database_user"}}"
instance = google_sql_database_instance.instance.name
password = "{{index $.Vars "database_password"}}"
}

resource "google_datastream_connection_profile" "default" {
provider = google-beta
display_name = "SQL Server Source"
location = "us-central1"
connection_profile_id = "{{index $.Vars "source_connection_profile_id"}}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
resource "google_sql_database_instance" "instance" {
provider = google-beta
name = "{{index $.Vars "sql_server_name"}}"
database_version = "SQLSERVER_2019_STANDARD"
region = "us-central1"
Expand Down Expand Up @@ -35,21 +34,18 @@ resource "google_sql_database_instance" "instance" {
}

resource "google_sql_database" "db" {
provider = google-beta
name = "{{index $.Vars "database_name"}}"
instance = google_sql_database_instance.instance.name
depends_on = [google_sql_user.user]
}

resource "google_sql_user" "user" {
provider = google-beta
name = "{{index $.Vars "database_user"}}"
instance = google_sql_database_instance.instance.name
password = "{{index $.Vars "database_password"}}"
}

resource "google_datastream_connection_profile" "source" {
provider = google-beta
display_name = "SQL Server Source"
location = "us-central1"
connection_profile_id = "{{index $.Vars "source_connection_profile_id"}}"
Expand All @@ -64,7 +60,6 @@ resource "google_datastream_connection_profile" "source" {
}

resource "google_datastream_connection_profile" "destination" {
provider = google-beta
display_name = "BigQuery Destination"
location = "us-central1"
connection_profile_id = "{{index $.Vars "destination_connection_profile_id"}}"
Expand All @@ -73,7 +68,6 @@ resource "google_datastream_connection_profile" "destination" {
}

resource "google_datastream_stream" "default" {
provider = google-beta
display_name = "SQL Server to BigQuery"
location = "us-central1"
stream_id = "{{index $.Vars "stream_id"}}"
Expand Down
Loading