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.

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

Jump to bottom

Upgrade terraform-provider-oci to v5.10.0 #194

Merged
merged 2 commits into from
Aug 24, 2023
Merged

Upgrade terraform-provider-oci to v5.10.0 #194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0ee005
make tfgen
rquitales Aug 23, 2023
b5c7260
make build_sdks
rquitales Aug 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
679 changes: 675 additions & 4 deletions provider/cmd/pulumi-resource-oci/bridge-metadata.json
View file
Open in desktop

Large diffs are not rendered by default.

4,531 changes: 3,763 additions & 768 deletions provider/cmd/pulumi-resource-oci/schema.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ replace (
)

require (
github.com/oracle/terraform-provider-oci v1.0.19-0.20230809100746-cb60e9052b7a // indirect
github.com/oracle/terraform-provider-oci v1.0.19-0.20230823063656-154610ffe69e // indirect
github.com/oracle/terraform-provider-oci/shim v0.0.0
github.com/pulumi/pulumi-terraform-bridge/v3 v3.56.2
github.com/pulumi/pulumi-terraform-bridge/v3 v3.57.0
github.com/pulumi/pulumi/pkg/v3 v3.76.1 // indirect
github.com/pulumi/pulumi/sdk/v3 v3.76.1
)
Expand Down Expand Up @@ -179,7 +179,7 @@ require (
github.com/oklog/run v1.1.0 // indirect
github.com/opentracing/basictracer-go v1.1.0 // indirect
github.com/opentracing/opentracing-go v1.2.0 // indirect
github.com/oracle/oci-go-sdk/v65 v65.47.0 // indirect
github.com/oracle/oci-go-sdk/v65 v65.47.2 // indirect
github.com/pgavlin/goldmark v1.1.33-0.20200616210433-b5eb04559386 // indirect
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
github.com/pjbgf/sha1cd v0.3.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions provider/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2028,10 +2028,10 @@ github.com/openzipkin-contrib/zipkin-go-opentracing v0.4.5/go.mod h1:/wsWhb9smxS
github.com/openzipkin/zipkin-go v0.1.6/go.mod h1:QgAqvLzwWbR/WpD4A3cGpPtJrZXNIiJc5AZX7/PBEpw=
github.com/openzipkin/zipkin-go v0.2.1/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
github.com/openzipkin/zipkin-go v0.2.2/go.mod h1:NaW6tEwdmWMaCDZzg8sh+IBNOxHMPnhQw8ySjnjRyN4=
github.com/oracle/oci-go-sdk/v65 v65.47.0 h1:GYN9ECywJBGr+MN05WO9zIsztI7hCDZ+skQ1xyPReoA=
github.com/oracle/oci-go-sdk/v65 v65.47.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
github.com/oracle/terraform-provider-oci v1.0.19-0.20230809100746-cb60e9052b7a h1:x2cReGMY6nomoJtOl1vmiZM9SOmoJQ4C34ppj6w5/TE=
github.com/oracle/terraform-provider-oci v1.0.19-0.20230809100746-cb60e9052b7a/go.mod h1:O8Fd3yci4naMVzeXEdwHjR5CtmZLLajkiGCKG/e1LnA=
github.com/oracle/oci-go-sdk/v65 v65.47.2 h1:tSb37xxw9T3CggDhQMsbLkwqx7v2U3z402Lg/xVLY1Y=
github.com/oracle/oci-go-sdk/v65 v65.47.2/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
github.com/oracle/terraform-provider-oci v1.0.19-0.20230823063656-154610ffe69e h1:jdyGeKCU1vGFoLwK6XpsU1j55XTquLbZQDON9Qv1M2Y=
github.com/oracle/terraform-provider-oci v1.0.19-0.20230823063656-154610ffe69e/go.mod h1:K0UVGPSEsHpnnyt00dYMByg/G2zAaxFAKxtudiw1+Kk=
github.com/pact-foundation/pact-go v1.0.4/go.mod h1:uExwJY4kCzNPcHRj+hCR/HBbOOIwwtUjcrb0b5/5kLM=
github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY=
Expand Down Expand Up @@ -2137,8 +2137,8 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T
github.com/pulumi/pulumi-java/pkg v0.9.4 h1:gIQZmlUI1o9ye8CL2XFqtmAX6Lwr9uj/+HzjboiSmK4=
github.com/pulumi/pulumi-java/pkg v0.9.4/go.mod h1:c6rSw/+q4O0IImgJ9axxoC6QesbPYWBaG5gimbHouUQ=
github.com/pulumi/pulumi-terraform-bridge/testing v0.0.1 h1:SCg1gjfY9N4yn8U8peIUYATifjoDABkyR7H9lmefsfc=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.56.2 h1:NY9kPxzquV8rW/YYYlu0o7LLF/NmfUGEY/uZ06h/CMw=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.56.2/go.mod h1:ykaml8e6XS/yI9JOcNZ+6gLirs6EWTB0FmjbT+JyEdU=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.57.0 h1:munOxi56glme47MT8/wI29o9wrRBJrEQuwjAgm1zviI=
github.com/pulumi/pulumi-terraform-bridge/v3 v3.57.0/go.mod h1:ykaml8e6XS/yI9JOcNZ+6gLirs6EWTB0FmjbT+JyEdU=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4 h1:rIzMmtcVpPX8ynaz6/nW5AHNY63DiNfCohqmxWvMpM4=
github.com/pulumi/pulumi-terraform-bridge/x/muxer v0.0.4/go.mod h1:Kt8RIZWa/N8rW3+0g6NrqCBmF3o+HuIhFaZpssEkG6w=
github.com/pulumi/pulumi-yaml v1.1.1 h1:8pyBNIU8+ym0wYpjhsCqN+cutygfK1XbhY2YEeNfyXY=
Expand Down
13 changes: 9 additions & 4 deletions provider/resources.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2411,10 +2411,15 @@ func Provider() tfbridge.ProviderInfo {
err := x.ComputeDefaults(&prov, x.TokensKnownModules("oci_", "", mappedModKeys,
func(mod, name string) (string, error) {
m, ok := moduleNameMap[strings.ToLower(mod)]
if !ok && mod == "recovery" {
m = recoveryMod
} else if !ok {
return "", fmt.Errorf("'%s' has unmapped module '%s'", name, mod)
if !ok {
switch mod {
case "recovery":
m = recoveryMod
case "bds":
m = bigDataServiceMod
default:
return "", fmt.Errorf("'%s' has unmapped module '%s'", name, mod)
}
}
return tfbridge.MakeResource(mainPkg, m, name).String(), nil
}))
Expand Down
4 changes: 2 additions & 2 deletions provider/shim/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.20

require (
github.com/hashicorp/terraform-plugin-sdk/v2 v2.22.0
github.com/oracle/terraform-provider-oci v1.0.19-0.20230809100746-cb60e9052b7a
github.com/oracle/terraform-provider-oci v1.0.19-0.20230823063656-154610ffe69e
)

replace github.com/hashicorp/terraform-exec => github.com/hashicorp/terraform-exec v0.14.0
Expand Down Expand Up @@ -46,7 +46,7 @@ require (
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/oklog/run v1.1.0 // indirect
github.com/oracle/oci-go-sdk/v65 v65.47.0 // indirect
github.com/oracle/oci-go-sdk/v65 v65.47.2 // indirect
github.com/sony/gobreaker v0.5.0 // indirect
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
Expand Down
8 changes: 4 additions & 4 deletions provider/shim/go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -479,10 +479,10 @@ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLA
github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce h1:RPclfga2SEJmgMmz2k+Mg7cowZ8yv4Trqw9UsJby758=
github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA=
github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU=
github.com/oracle/oci-go-sdk/v65 v65.47.0 h1:GYN9ECywJBGr+MN05WO9zIsztI7hCDZ+skQ1xyPReoA=
github.com/oracle/oci-go-sdk/v65 v65.47.0/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
github.com/oracle/terraform-provider-oci v1.0.19-0.20230809100746-cb60e9052b7a h1:x2cReGMY6nomoJtOl1vmiZM9SOmoJQ4C34ppj6w5/TE=
github.com/oracle/terraform-provider-oci v1.0.19-0.20230809100746-cb60e9052b7a/go.mod h1:O8Fd3yci4naMVzeXEdwHjR5CtmZLLajkiGCKG/e1LnA=
github.com/oracle/oci-go-sdk/v65 v65.47.2 h1:tSb37xxw9T3CggDhQMsbLkwqx7v2U3z402Lg/xVLY1Y=
github.com/oracle/oci-go-sdk/v65 v65.47.2/go.mod h1:IBEV9l1qBzUpo7zgGaRUhbB05BVfcDGYRFBCPlTcPp0=
github.com/oracle/terraform-provider-oci v1.0.19-0.20230823063656-154610ffe69e h1:jdyGeKCU1vGFoLwK6XpsU1j55XTquLbZQDON9Qv1M2Y=
github.com/oracle/terraform-provider-oci v1.0.19-0.20230823063656-154610ffe69e/go.mod h1:K0UVGPSEsHpnnyt00dYMByg/G2zAaxFAKxtudiw1+Kk=
github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
6 changes: 3 additions & 3 deletions sdk/dotnet/BigDataService/AutoScalingConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public partial class AutoScalingConfiguration : global::Pulumi.CustomResource
public Output<bool> IsEnabled { get; private set; } = null!;

/// <summary>
/// A node type that is managed by an autoscale configuration. The only supported types are WORKER and COMPUTE_ONLY_WORKER.
/// A node type that is managed by an autoscale configuration. The only supported types are WORKER, COMPUTE_ONLY_WORKER and KAFKA_BROKER.
/// </summary>
[Output("nodeType")]
public Output<string> NodeType { get; private set; } = null!;
Expand Down Expand Up @@ -240,7 +240,7 @@ public Input<string>? ClusterAdminPassword
public Input<bool> IsEnabled { get; set; } = null!;

/// <summary>
/// A node type that is managed by an autoscale configuration. The only supported types are WORKER and COMPUTE_ONLY_WORKER.
/// A node type that is managed by an autoscale configuration. The only supported types are WORKER, COMPUTE_ONLY_WORKER and KAFKA_BROKER.
/// </summary>
[Input("nodeType", required: true)]
public Input<string> NodeType { get; set; } = null!;
Expand Down Expand Up @@ -310,7 +310,7 @@ public Input<string>? ClusterAdminPassword
public Input<bool>? IsEnabled { get; set; }

/// <summary>
/// A node type that is managed by an autoscale configuration. The only supported types are WORKER and COMPUTE_ONLY_WORKER.
/// A node type that is managed by an autoscale configuration. The only supported types are WORKER, COMPUTE_ONLY_WORKER and KAFKA_BROKER.
/// </summary>
[Input("nodeType")]
public Input<string>? NodeType { get; set; }
Expand Down
Loading
Loading