Skip to content

Commit

Permalink
Merge pull request #567 from ovh/dev/aamstutz/fix-tests
Browse files Browse the repository at this point in the history
fix: Bump dependencies + fix failing tests
  • Loading branch information
rbeuque74 authored Mar 8, 2024
2 parents 054eb27 + b802a15 commit 5e73142
Show file tree
Hide file tree
Showing 454 changed files with 56,155 additions and 9,669 deletions.
52 changes: 28 additions & 24 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@ require (
github.com/hashicorp/go-cleanhttp v0.5.2
github.com/hashicorp/go-version v1.6.0
github.com/hashicorp/terraform-plugin-framework v1.4.2
github.com/hashicorp/terraform-plugin-go v0.20.0
github.com/hashicorp/terraform-plugin-mux v0.13.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.31.0
github.com/hashicorp/terraform-plugin-testing v1.6.0
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0
github.com/hashicorp/terraform-plugin-go v0.22.0
github.com/hashicorp/terraform-plugin-mux v0.15.0
github.com/hashicorp/terraform-plugin-sdk/v2 v2.33.0
github.com/hashicorp/terraform-plugin-testing v1.7.0
github.com/mitchellh/go-homedir v1.1.0
github.com/ovh/go-ovh v1.4.2
github.com/ybriffa/rfc3339 v0.0.0-20220203155318-1789e3fd6e70
Expand All @@ -18,31 +19,31 @@ require (
)

require (
github.com/ProtonMail/go-crypto v0.0.0-20230828082145-3c4c8a2d2371 // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect
github.com/agext/levenshtein v1.2.2 // indirect
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/fatih/color v1.13.0 // indirect
github.com/fatih/color v1.16.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
github.com/hashicorp/go-hclog v1.5.0 // indirect
github.com/hashicorp/go-hclog v1.6.2 // indirect
github.com/hashicorp/go-multierror v1.1.1 // indirect
github.com/hashicorp/go-plugin v1.6.0 // indirect
github.com/hashicorp/go-uuid v1.0.3 // indirect
github.com/hashicorp/hc-install v0.6.2 // indirect
github.com/hashicorp/hcl/v2 v2.19.1 // indirect
github.com/hashicorp/hc-install v0.6.3 // indirect
github.com/hashicorp/hcl/v2 v2.20.0 // indirect
github.com/hashicorp/logutils v1.0.0 // indirect
github.com/hashicorp/terraform-exec v0.19.0 // indirect
github.com/hashicorp/terraform-json v0.18.0 // indirect
github.com/hashicorp/terraform-plugin-framework-validators v0.12.0 // indirect
github.com/hashicorp/terraform-exec v0.20.0 // indirect
github.com/hashicorp/terraform-json v0.21.0 // indirect
github.com/hashicorp/terraform-plugin-log v0.9.0 // indirect
github.com/hashicorp/terraform-registry-address v0.2.3 // indirect
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
github.com/hashicorp/yamux v0.1.1 // indirect
github.com/mattn/go-colorable v0.1.12 // indirect
github.com/mattn/go-isatty v0.0.14 // indirect
github.com/kr/pretty v0.3.0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
Expand All @@ -52,18 +53,21 @@ require (
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
github.com/zclconf/go-cty v1.14.1 // indirect
golang.org/x/crypto v0.17.0 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.18.0 // indirect
golang.org/x/sys v0.15.0 // indirect
github.com/zclconf/go-cty v1.14.3 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/mod v0.15.0 // indirect
golang.org/x/net v0.21.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/tools v0.13.0 // indirect
google.golang.org/appengine v1.6.8 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20231002182017-d307bd883b97 // indirect
google.golang.org/grpc v1.60.0 // indirect
google.golang.org/protobuf v1.31.0 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240123012728-ef4313101c80 // indirect
google.golang.org/grpc v1.62.0 // indirect
google.golang.org/protobuf v1.32.0 // indirect
)

go 1.20
go 1.21

toolchain go1.21.1

retract v0.36.0 // OVH_ENDPOINT environment variable prevent a correct usage of the terraform provider
145 changes: 82 additions & 63 deletions go.sum

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ovh/data_cloud_project_database_mongodb_user_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resource "ovh_cloud_project_database" "db" {
description = "%s"
engine = "mongodb"
version = "%s"
plan = "discovery"
plan = "production"
nodes {
region = "%s"
}
Expand Down
2 changes: 1 addition & 1 deletion ovh/resource_cloud_project_database_mongodb_user_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ resource "ovh_cloud_project_database" "db" {
description = "%s"
engine = "mongodb"
version = "%s"
plan = "discovery"
plan = "production"
nodes {
region = "%s"
}
Expand Down
13 changes: 13 additions & 0 deletions ovh/resource_dedicated_server_install_task_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ func TestAccDedicatedServerInstall_basic(t *testing.T) {
testAccPreCheckDedicatedServer(t)
},
Providers: testAccProviders,
ExternalProviders: map[string]resource.ExternalProvider{
"time": {
VersionConstraint: "0.10.0",
Source: "hashicorp/time",
},
},
Steps: []resource.TestStep{
{
Config: testAccDedicatedServerInstallConfig("basic"),
Expand Down Expand Up @@ -120,9 +126,16 @@ resource "ovh_me_installation_template" "debian" {
}
}
resource "time_sleep" "wait_for_ssh_key_sync" {
create_duration = "60s"
depends_on = [ovh_me_installation_template.debian]
}
resource ovh_dedicated_server_install_task "server_install" {
service_name = data.ovh_dedicated_server_boots.harddisk.service_name
template_name = ovh_me_installation_template.debian.template_name
depends_on = [time_sleep.wait_for_ssh_key_sync]
}
`

Expand Down
5 changes: 3 additions & 2 deletions vendor/github.com/ProtonMail/go-crypto/ocb/ocb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

66 changes: 9 additions & 57 deletions vendor/github.com/ProtonMail/go-crypto/openpgp/armor/armor.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 57 additions & 20 deletions vendor/github.com/ProtonMail/go-crypto/openpgp/armor/encode.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 5e73142

Please sign in to comment.