Skip to content

Commit

Permalink
Merge pull request #6 from lbrlabs/upd
Browse files Browse the repository at this point in the history
update to cockroach provider v1.30.0
  • Loading branch information
jaxxstorm authored Oct 4, 2023
2 parents 5beb4e6 + 9d25964 commit 373e25d
Show file tree
Hide file tree
Showing 352 changed files with 10,375 additions and 2,388 deletions.
1 change: 1 addition & 0 deletions .upgrade-config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
upstream-provider-name: terraform-provider-cockroach
9 changes: 7 additions & 2 deletions go.work.sum
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ cloud.google.com/go/websecurityscanner v1.5.0/go.mod h1:Y6xdCPy81yi0SQnDY1xdNTNp
cloud.google.com/go/workflows v1.10.0/go.mod h1:fZ8LmRmZQWacon9UCX1r/g/DfAXx5VcPALq2CxzdePw=
github.com/Masterminds/sprig v2.22.0+incompatible h1:z4yfnGrZ7netVz+0EDJ0Wi+5VZCSYp4Z0m2dk6cEM60=
github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
github.com/apparentlymart/go-dump v0.0.0-20180507223929-23540a00eaa3/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
github.com/apparentlymart/go-dump v0.0.0-20190214190832-042adf3cf4a0/go.mod h1:oL81AME2rN47vu18xqj1S1jPIPuN7afo62yKTNn3XMM=
github.com/apparentlymart/go-textseg v1.0.0 h1:rRmlIsPEEhUTIKQb7T++Nz/A5Q6C9IuX2wFoYVvnCs0=
Expand All @@ -133,6 +134,7 @@ github.com/census-instrumentation/opencensus-proto v0.4.1/go.mod h1:4T9NM4+4Vw91
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
github.com/cncf/udpa/go v0.0.0-20220112060539-c52dc94e7fbe/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI=
github.com/cncf/xds/go v0.0.0-20230607035331-e9ce68804cb4/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw=
github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=
github.com/envoyproxy/go-control-plane v0.11.1-0.20230524094728-9239064ad72f/go.mod h1:sfYdkwUW4BA3PbKjySwjJy+O4Pu0h62rlqCMHNk+K+Q=
github.com/envoyproxy/protoc-gen-validate v0.10.1/go.mod h1:DRjgyB0I43LtJapqN6NiRwroiAU2PaFuvk/vjgh61ss=
Expand All @@ -141,24 +143,27 @@ github.com/googleapis/enterprise-certificate-proxy v0.2.1/go.mod h1:AwSRAtLfXpU5
github.com/googleapis/gax-go/v2 v2.7.0 h1:IcsPKeInNvYi7eqSaDjiZqDDKu5rsmunY0Y1YupQSSQ=
github.com/googleapis/gax-go/v2 v2.7.0/go.mod h1:TEop28CZZQ2y+c0VxMUmu1lV+fQx57QpBWsYpwqHJx8=
github.com/hashicorp/go-plugin v1.4.8/go.mod h1:viDMjcLJuDui6pXb8U4HVfb8AamCWhHGUjr2IrTF67s=
github.com/hashicorp/hcl/v2 v2.15.0/go.mod h1:JRmR89jycNkrrqnMmvPDMd56n1rQJ2Q6KocSLCMCXng=
github.com/hashicorp/terraform-plugin-docs v0.13.0/go.mod h1:W0oCmHAjIlTHBbvtppWHe8fLfZ2BznQbuv8+UD8OucQ=
github.com/hashicorp/terraform-plugin-framework v1.1.1/go.mod h1:DyZPxQA+4OKK5ELxFIIcqggcszqdWWUpTLPHAhS/tkY=
github.com/hashicorp/terraform-plugin-go v0.14.3/go.mod h1:7ees7DMZ263q8wQ6E4RdIdR6nHHJtrdt4ogX5lPkX1A=
github.com/hashicorp/terraform-plugin-log v0.7.0/go.mod h1:p4R1jWBXRTvL4odmEkFfDdhUjHf9zcs/BCoNHAc7IK4=
github.com/hashicorp/terraform-registry-address v0.1.0/go.mod h1:EnyO2jYO6j29DTHbJcm00E5nQTFeTtyZH3H5ycydQ5A=
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg=
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
github.com/mitchellh/go-wordwrap v0.0.0-20150314170334-ad45545899c7/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
github.com/pulumi/pulumi-terraform-bridge/pf v0.11.0 h1:PiInpzC9+ovgq5WGe1br7vE7GM1MdCicBaTEVZvHQac=
github.com/pulumi/pulumi-terraform-bridge/pf v0.11.0/go.mod h1:0aAzyG6EnVJ5G9rXO6mUQHcknAgbCcT/FED+lgROF0o=
github.com/pulumi/pulumi-terraform-bridge/pf v0.11.1-0.20230605212537-46a92ef1828f/go.mod h1:OPJixCnFgMXgBayLTEXouG1ef28YONNSQpXk7t9V34k=
github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
github.com/spf13/pflag v1.0.2/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
github.com/vmihailenco/tagparser v0.1.2 h1:gnjoVuB/kljJ5wICEEOpx98oXMWPLj22G67Vbd1qPqc=
github.com/vmihailenco/tagparser v0.1.2/go.mod h1:OeAg3pn3UbLjkWt+rN9oFYB6u/cQgqMEUPoW2WPyhdI=
github.com/zclconf/go-cty v1.1.0/go.mod h1:xnAOWiHeOqg2nWS62VtQ7pbOu17FtxJNW8RLEih+O3s=
github.com/zclconf/go-cty v1.12.1/go.mod h1:s9IfD1LK5ccNMSWCVFCE2rJfHiZgi7JijgeWIMfhLvA=
github.com/zclconf/go-cty v1.13.1/go.mod h1:YKQzy/7pZ7iq2jNFzy5go57xdxdWoLLpaEp4u238AE0=
golang.org/x/crypto v0.0.0-20220517005047-85d78b3ac167/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.7.0/go.mod h1:pYwdfH91IfpZVANVyUOhSIPZaFoJGxTFbZhFTx+dXZU=
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
Expand Down
31 changes: 30 additions & 1 deletion provider/cmd/pulumi-resource-cockroach/bridge-metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,23 @@
"renames": {
"resources": {
"cockroach:index/allowList:AllowList": "cockroach_allow_list",
"cockroach:index/apiOidcConfig:ApiOidcConfig": "cockroach_api_oidc_config",
"cockroach:index/caCert:CaCert": "cockroach_client_ca_cert",
"cockroach:index/cluster:Cluster": "cockroach_cluster",
"cockroach:index/cmek:Cmek": "cockroach_cmek",
"cockroach:index/database:Database": "cockroach_database",
"cockroach:index/finalizeVersionUpgrade:FinalizeVersionUpgrade": "cockroach_finalize_version_upgrade",
"cockroach:index/folder:Folder": "cockroach_folder",
"cockroach:index/logExportConfig:LogExportConfig": "cockroach_log_export_config",
"cockroach:index/maintenanceWindow:MaintenanceWindow": "cockroach_maintenance_window",
"cockroach:index/metricExportCloudwatchConfig:MetricExportCloudwatchConfig": "cockroach_metric_export_cloudwatch_config",
"cockroach:index/metricExportDatadogConfig:MetricExportDatadogConfig": "cockroach_metric_export_datadog_config",
"cockroach:index/privateEndpointConnection:PrivateEndpointConnection": "cockroach_private_endpoint_connection",
"cockroach:index/privateEndpointServices:PrivateEndpointServices": "cockroach_private_endpoint_services",
"cockroach:index/privateEndpointTrustedOwner:PrivateEndpointTrustedOwner": "cockroach_private_endpoint_trusted_owner",
"cockroach:index/sqlUser:SqlUser": "cockroach_sql_user",
"cockroach:index/userRoleGrants:UserRoleGrants": "cockroach_user_role_grants"
"cockroach:index/userRoleGrants:UserRoleGrants": "cockroach_user_role_grants",
"cockroach:index/versionDeferral:VersionDeferral": "cockroach_version_deferral"
},
"functions": {
"cockroach:index/getClusterCert:getClusterCert": "cockroach_cluster_cert",
Expand All @@ -24,6 +28,11 @@
"cockroach:index/getPersonUser:getPersonUser": "cockroach_person_user"
},
"renamedProperties": {
"cockroach:index/ApiOidcConfigIdentityMap:ApiOidcConfigIdentityMap": {
"ccIdentity": "cc_identity",
"isRegex": "is_regex",
"tokenIdentity": "token_identity"
},
"cockroach:index/ClusterDedicated:ClusterDedicated": {
"diskIops": "disk_iops",
"machineType": "machine_type",
Expand All @@ -33,6 +42,7 @@
"storageGib": "storage_gib"
},
"cockroach:index/ClusterRegion:ClusterRegion": {
"internalDns": "internal_dns",
"nodeCount": "node_count",
"sqlDns": "sql_dns",
"uiDns": "ui_dns"
Expand All @@ -47,6 +57,7 @@
"storageMibLimit": "storage_mib_limit"
},
"cockroach:index/CmekAdditionalRegion:CmekAdditionalRegion": {
"internalDns": "internal_dns",
"nodeCount": "node_count",
"sqlDns": "sql_dns",
"uiDns": "ui_dns"
Expand Down Expand Up @@ -80,6 +91,9 @@
"cidrMask": "cidr_mask",
"clusterId": "cluster_id"
},
"cockroach:index/apiOidcConfig:ApiOidcConfig": {
"identityMaps": "identity_map"
},
"cockroach:index/caCert:CaCert": {
"clusterId": "id",
"x509PemCert": "x509_pem_cert"
Expand All @@ -91,6 +105,7 @@
"cockroachVersion": "cockroach_version",
"creatorId": "creator_id",
"operationStatus": "operation_status",
"parentId": "parent_id",
"upgradeStatus": "upgrade_status"
},
"cockroach:index/cmek:Cmek": {
Expand All @@ -105,12 +120,16 @@
"clusterId": "id",
"cockroachVersion": "cockroach_version"
},
"cockroach:index/folder:Folder": {
"parentId": "parent_id"
},
"cockroach:index/getCockroachCluster:getCockroachCluster": {
"accountId": "account_id",
"cloudProvider": "cloud_provider",
"cockroachVersion": "cockroach_version",
"creatorId": "creator_id",
"operationStatus": "operation_status",
"parentId": "parent_id",
"upgradeStatus": "upgrade_status"
},
"cockroach:index/getCockroachClusterDedicated:getCockroachClusterDedicated": {
Expand All @@ -122,6 +141,7 @@
"storageGib": "storage_gib"
},
"cockroach:index/getCockroachClusterRegion:getCockroachClusterRegion": {
"internalDns": "internal_dns",
"nodeCount": "node_count",
"sqlDns": "sql_dns",
"uiDns": "ui_dns"
Expand All @@ -148,6 +168,7 @@
"clusterId": "id",
"createdAt": "created_at",
"logName": "log_name",
"omittedChannels": "omitted_channels",
"updatedAt": "updated_at",
"userMessage": "user_message"
},
Expand Down Expand Up @@ -178,11 +199,19 @@
"cockroach:index/privateEndpointServices:PrivateEndpointServices": {
"clusterId": "cluster_id"
},
"cockroach:index/privateEndpointTrustedOwner:PrivateEndpointTrustedOwner": {
"clusterId": "cluster_id",
"externalOwnerId": "external_owner_id",
"ownerId": "owner_id"
},
"cockroach:index/sqlUser:SqlUser": {
"clusterId": "cluster_id"
},
"cockroach:index/userRoleGrants:UserRoleGrants": {
"userId": "user_id"
},
"cockroach:index/versionDeferral:VersionDeferral": {
"deferralPolicy": "deferral_policy"
}
}
}
Expand Down
Loading

0 comments on commit 373e25d

Please sign in to comment.