Skip to content

Commit 680527a

Browse files
authored
Merge pull request #8 from smartxworks/misc-update
Misc update
2 parents c43f4e8 + 969c45e commit 680527a

File tree

13 files changed

+231
-335
lines changed

13 files changed

+231
-335
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,13 +54,13 @@ MvCmd =
5454
CleanRegistryCmd =
5555
ifeq ($(GOOS),windows)
5656
BuildTarget = .\bin\terraform-provider-cloudtower.exe
57-
LocalRegistry = $(APPDATA)\terraform.d\plugins\registry.terraform.io\smartx\cloudtower\$(version)\$(GOOS)_$(GOARCH)
57+
LocalRegistry = $(APPDATA)\terraform.d\plugins\registry.terraform.io\smartxworks\cloudtower\$(version)\$(GOOS)_$(GOARCH)
5858
MkdirCmd = mkdir $(LocalRegistry)
5959
MvCmd = move $(BuildTarget) $(LocalRegistry)
6060
CleanRegistryCmd = if exist "$(LocalRegistry)" rmdir /S /Q $(LocalRegistry)
6161
else
6262
BuildTarget = ./bin/terraform-provider-cloudtower
63-
LocalRegistry = ~/.terraform.d/plugins/registry.terraform.io/smartx/cloudtower/$(version)/$(GOOS)_$(GOARCH)/
63+
LocalRegistry = ~/.terraform.d/plugins/registry.terraform.io/smartxworks/cloudtower/$(version)/$(GOOS)_$(GOARCH)/
6464
MkdirCmd = mkdir -p $(LocalRegistry)
6565
MvCmd = mv $(BuildTarget) $(LocalRegistry)
6666
CleanRegistryCmd = if [ -d "$(LocalRegistry)" ]; then rm -rf $(LocalRegistry); fi

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.1.5
1+
0.1.6

docs/resources/cloudtower_vm.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ CloudTower vm resource.
2828
- **create_effect** (Block List, Max: 1) (see [below for nested schema](#nestedblock--create_effect))
2929
- **description** (String) VM's description
3030
- **disk** (Block List) VM's virtual disks (see [below for nested schema](#nestedblock--disk))
31-
- **firmware** (String) VM's firmware
31+
- **firmware** (String) VM's firmware, forcenew as it isn't able to modify after create, must be one of 'BIOS', 'UEFI'
3232
- **folder_id** (String) VM's folder id
3333
- **force_status_change** (Boolean) force VM's status change, will apply when power off or restart
3434
- **guest_os_type** (String) VM's guest OS type
3535
- **ha** (Boolean) whether VM is HA or not
3636
- **host_id** (String) VM's host id
37-
- **memory** (Number) VM's memory, in the unit of byte
37+
- **memory** (Number) VM's memory, in the unit of byte, must be a multiple of 512MB, long value, ignore the decimal point
3838
- **nic** (Block List) VM's virtual nic (see [below for nested schema](#nestedblock--nic))
3939
- **rollback_to** (String) Vm is going to rollback to target snapshot
4040
- **status** (String) VM's status

examples/clone/clone.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
terraform {
22
required_providers {
33
cloudtower = {
4-
version = "~> 0.1.4"
5-
source = "registry.terraform.io/smartx/cloudtower"
4+
version = "~> 0.1.6"
5+
source = "registry.terraform.io/smartxworks/cloudtower"
66
}
77
}
88
}

examples/create-vm-from-template/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
terraform {
22
required_providers {
33
cloudtower = {
4-
version = "~> 0.1.4"
5-
source = "registry.terraform.io/smartx/cloudtower"
4+
version = "~> 0.1.6"
5+
source = "registry.terraform.io/smartxworks/cloudtower"
66
}
77
}
88
}

examples/create/create.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
terraform {
22
required_providers {
33
cloudtower = {
4-
version = "~> 0.1.4"
5-
source = "registry.terraform.io/smartx/cloudtower"
4+
version = "~> 0.1.6"
5+
source = "registry.terraform.io/smartxworks/cloudtower"
66
}
77
}
88
}

examples/snapshot/snapshot.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
terraform {
22
required_providers {
33
cloudtower = {
4-
version = "~> 0.1.4"
5-
source = "registry.terraform.io/smartx/cloudtower"
4+
version = "~> 0.1.6"
5+
source = "registry.terraform.io/smartxworks/cloudtower"
66
}
77
}
88
}

examples/template-clone-from-vm/main.tf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
terraform {
22
required_providers {
33
cloudtower = {
4-
version = "~> 0.1.4"
5-
source = "registry.terraform.io/smartx/cloudtower"
4+
version = "~> 0.1.6"
5+
source = "registry.terraform.io/smartxworks/cloudtower"
66
}
77
}
88
}

go.mod

Lines changed: 64 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,71 @@ module github.com/hashicorp/terraform-provider-cloudtower
33
go 1.16
44

55
require (
6+
github.com/hashicorp/terraform-plugin-docs v0.9.0
7+
github.com/hashicorp/terraform-plugin-framework v0.8.0 // indirect
8+
github.com/hashicorp/terraform-plugin-go v0.9.1 // indirect
9+
github.com/hashicorp/terraform-plugin-log v0.4.0 // indirect
10+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.17.0
11+
github.com/smartxworks/cloudtower-go-sdk/v2 v2.0.0
12+
github.com/hasura/go-graphql-client v0.7.0
13+
)
14+
15+
require (
16+
github.com/Masterminds/goutils v1.1.1 // indirect
17+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
18+
github.com/Masterminds/sprig/v3 v3.2.2 // indirect
19+
github.com/agext/levenshtein v1.2.2 // indirect
20+
github.com/apparentlymart/go-textseg/v13 v13.0.0 // indirect
21+
github.com/armon/go-radix v1.0.0 // indirect
22+
github.com/bgentry/speakeasy v0.1.0 // indirect
23+
github.com/davecgh/go-spew v1.1.1 // indirect
24+
github.com/fatih/color v1.13.0 // indirect
625
github.com/go-openapi/runtime v0.23.1
726
github.com/go-openapi/strfmt v0.21.2
27+
github.com/golang/protobuf v1.5.2 // indirect
28+
github.com/google/go-cmp v0.5.8 // indirect
29+
github.com/google/uuid v1.3.0 // indirect
30+
github.com/hashicorp/errwrap v1.1.0 // indirect
31+
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
32+
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
833
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320
9-
github.com/hashicorp/terraform-plugin-docs v0.5.1
10-
github.com/hashicorp/terraform-plugin-log v0.2.1 // indirect
11-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.10.1
12-
github.com/hasura/go-graphql-client v0.7.0
13-
github.com/klauspost/compress v1.15.4 // indirect
14-
github.com/smartxworks/cloudtower-go-sdk/v2 v2.0.0
34+
github.com/hashicorp/go-hclog v1.2.0 // indirect
35+
github.com/hashicorp/go-multierror v1.1.1 // indirect
36+
github.com/hashicorp/go-plugin v1.4.4 // indirect
37+
github.com/hashicorp/go-uuid v1.0.3 // indirect
38+
github.com/hashicorp/go-version v1.5.0 // indirect
39+
github.com/hashicorp/hc-install v0.3.2 // indirect
40+
github.com/hashicorp/hcl/v2 v2.12.0 // indirect
41+
github.com/hashicorp/logutils v1.0.0 // indirect
42+
github.com/hashicorp/terraform-exec v0.16.1 // indirect
43+
github.com/hashicorp/terraform-json v0.14.0 // indirect
44+
github.com/hashicorp/terraform-registry-address v0.0.0-20210412075316-9b2996cce896 // indirect
45+
github.com/hashicorp/terraform-svchost v0.0.0-20200729002733-f050f53b9734 // indirect
46+
github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d // indirect
47+
github.com/huandu/xstrings v1.3.2 // indirect
48+
github.com/imdario/mergo v0.3.13 // indirect
49+
github.com/mattn/go-colorable v0.1.12 // indirect
50+
github.com/mattn/go-isatty v0.0.14 // indirect
51+
github.com/mitchellh/cli v1.1.4 // indirect
52+
github.com/mitchellh/copystructure v1.2.0 // indirect
53+
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
54+
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
55+
github.com/mitchellh/mapstructure v1.5.0 // indirect
56+
github.com/mitchellh/reflectwalk v1.0.2 // indirect
57+
github.com/oklog/run v1.0.0 // indirect
58+
github.com/posener/complete v1.2.3 // indirect
59+
github.com/russross/blackfriday v1.6.0 // indirect
60+
github.com/shopspring/decimal v1.3.1 // indirect
61+
github.com/spf13/cast v1.5.0 // indirect
62+
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
63+
github.com/vmihailenco/msgpack/v4 v4.3.12 // indirect
64+
github.com/vmihailenco/tagparser v0.1.1 // indirect
65+
github.com/zclconf/go-cty v1.10.0 // indirect
66+
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
67+
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a // indirect
68+
golang.org/x/text v0.3.7 // indirect
69+
google.golang.org/appengine v1.6.6 // indirect
70+
google.golang.org/genproto v0.0.0-20200711021454-869866162049 // indirect
71+
google.golang.org/grpc v1.46.0 // indirect
72+
google.golang.org/protobuf v1.28.0 // indirect
1573
)

0 commit comments

Comments
 (0)