Skip to content

Commit 9678c0d

Browse files
srinivasgowda097srinivasgowda097
authored
Merge pull request #54 from jfrog/JTFPR-146
Fix - Custom Domain Name update fails after resource import and apply
2 parents acf522b + df83100 commit 9678c0d

File tree

8 files changed

+429
-156
lines changed

8 files changed

+429
-156
lines changed

‎CHANGELOG.md‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 1.0.2 (Nov 7, 2025). Tested on Artifactory with Terraform 1.13.5 and OpenTofu 1.10.7
2+
3+
BUG FIXES:
4+
5+
* Fix Custom Domain Name update fails after resource import and apply.
6+
17
## 1.0.1 (January 23, 2024)
28

39
BUG FIXES:

‎GNUmakefile‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ GO_ARCH=$(shell go env GOARCH)
44
TARGET_ARCH=$(shell go env GOOS)_${GO_ARCH}
55
GORELEASER_ARCH=${TARGET_ARCH}
66

7+
ifeq ($(GO_ARCH), arm64)
8+
GORELEASER_ARCH=${TARGET_ARCH}_$(shell go env GOARM64)
9+
endif
10+
711
ifeq ($(GO_ARCH), amd64)
812
GORELEASER_ARCH=${TARGET_ARCH}_$(shell go env GOAMD64)
913
endif
@@ -37,7 +41,7 @@ default: build
3741
install: clean build
3842
mkdir -p ${BUILD_PATH} && \
3943
mv -v dist/terraform-provider-${PRODUCT}_${GORELEASER_ARCH}/terraform-provider-${PRODUCT}_v${NEXT_VERSION}* ${BUILD_PATH} && \
40-
sed -i.bak '0,/version = ".*"/s//version = "${NEXT_VERSION}"/' sample.tf && rm sample.tf.bak && \
44+
sed -i.bak 's/version = ".*"/version = "${NEXT_VERSION}"/' sample.tf && rm sample.tf.bak && \
4145
${TERRAFORM_CLI} init
4246

4347
clean:

‎go.mod‎

Lines changed: 40 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
module github.com/jfrog/terraform-provider-myjfrog
22

3-
go 1.23
3+
go 1.24.0
44

55
require (
66
github.com/go-resty/resty/v2 v2.16.5
77
github.com/hashicorp/terraform-plugin-docs v0.20.1
8-
github.com/hashicorp/terraform-plugin-framework v1.14.1
9-
github.com/hashicorp/terraform-plugin-framework-validators v0.17.0
10-
github.com/hashicorp/terraform-plugin-go v0.26.0
8+
github.com/hashicorp/terraform-plugin-framework v1.16.1
9+
github.com/hashicorp/terraform-plugin-framework-validators v0.19.0
10+
github.com/hashicorp/terraform-plugin-go v0.29.0
1111
github.com/hashicorp/terraform-plugin-log v0.9.0
12-
github.com/hashicorp/terraform-plugin-testing v1.11.0
13-
github.com/jfrog/terraform-provider-shared v1.28.0
14-
github.com/samber/lo v1.49.1
12+
github.com/hashicorp/terraform-plugin-testing v1.13.3
13+
github.com/jfrog/terraform-provider-shared v1.30.6
14+
github.com/samber/lo v1.52.0
1515
github.com/sethvargo/go-retry v0.3.0
1616
)
1717

@@ -21,71 +21,72 @@ require (
2121
github.com/Masterminds/goutils v1.1.1 // indirect
2222
github.com/Masterminds/semver/v3 v3.2.0 // indirect
2323
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
24-
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
25-
github.com/agext/levenshtein v1.2.2 // indirect
24+
github.com/ProtonMail/go-crypto v1.3.0 // indirect
25+
github.com/agext/levenshtein v1.2.3 // indirect
2626
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
2727
github.com/armon/go-radix v1.0.0 // indirect
2828
github.com/bgentry/speakeasy v0.1.0 // indirect
2929
github.com/bmatcuk/doublestar/v4 v4.7.1 // indirect
30-
github.com/cloudflare/circl v1.3.7 // indirect
31-
github.com/fatih/color v1.16.0 // indirect
30+
github.com/cloudflare/circl v1.6.1 // indirect
31+
github.com/fatih/color v1.18.0 // indirect
3232
github.com/golang/protobuf v1.5.4 // indirect
33-
github.com/google/go-cmp v0.6.0 // indirect
33+
github.com/google/go-cmp v0.7.0 // indirect
3434
github.com/google/uuid v1.6.0 // indirect
35-
github.com/gorhill/cronexpr v0.0.0-20180427100037-88b0669f7d75 // indirect
36-
github.com/hashicorp/cli v1.1.6 // indirect
35+
github.com/hashicorp/cli v1.1.7 // indirect
3736
github.com/hashicorp/errwrap v1.1.0 // indirect
3837
github.com/hashicorp/go-checkpoint v0.5.0 // indirect
3938
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
40-
github.com/hashicorp/go-cty v1.4.1-0.20200414143053-d3edf31b6320 // indirect
39+
github.com/hashicorp/go-cty v1.5.0 // indirect
4140
github.com/hashicorp/go-hclog v1.6.3 // indirect
4241
github.com/hashicorp/go-multierror v1.1.1 // indirect
43-
github.com/hashicorp/go-plugin v1.6.2 // indirect
44-
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
42+
github.com/hashicorp/go-plugin v1.7.0 // indirect
43+
github.com/hashicorp/go-retryablehttp v0.7.8 // indirect
4544
github.com/hashicorp/go-uuid v1.0.3 // indirect
4645
github.com/hashicorp/go-version v1.7.0 // indirect
47-
github.com/hashicorp/hc-install v0.9.0 // indirect
48-
github.com/hashicorp/hcl/v2 v2.23.0 // indirect
46+
github.com/hashicorp/hc-install v0.9.2 // indirect
47+
github.com/hashicorp/hcl/v2 v2.24.0 // indirect
4948
github.com/hashicorp/logutils v1.0.0 // indirect
50-
github.com/hashicorp/terraform-exec v0.21.0 // indirect
51-
github.com/hashicorp/terraform-json v0.23.0 // indirect
52-
github.com/hashicorp/terraform-plugin-sdk/v2 v2.35.0 // indirect
53-
github.com/hashicorp/terraform-registry-address v0.2.4 // indirect
49+
github.com/hashicorp/terraform-exec v0.23.1 // indirect
50+
github.com/hashicorp/terraform-json v0.26.0 // indirect
51+
github.com/hashicorp/terraform-plugin-sdk/v2 v2.37.0 // indirect
52+
github.com/hashicorp/terraform-registry-address v0.4.0 // indirect
5453
github.com/hashicorp/terraform-svchost v0.1.1 // indirect
55-
github.com/hashicorp/yamux v0.1.1 // indirect
54+
github.com/hashicorp/yamux v0.1.2 // indirect
5655
github.com/huandu/xstrings v1.3.3 // indirect
5756
github.com/imdario/mergo v0.3.15 // indirect
58-
github.com/mattn/go-colorable v0.1.13 // indirect
57+
github.com/mattn/go-colorable v0.1.14 // indirect
5958
github.com/mattn/go-isatty v0.0.20 // indirect
6059
github.com/mattn/go-runewidth v0.0.9 // indirect
6160
github.com/mitchellh/copystructure v1.2.0 // indirect
6261
github.com/mitchellh/go-testing-interface v1.14.1 // indirect
63-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
62+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6463
github.com/mitchellh/mapstructure v1.5.0 // indirect
6564
github.com/mitchellh/reflectwalk v1.0.2 // indirect
66-
github.com/oklog/run v1.0.0 // indirect
65+
github.com/oklog/run v1.2.0 // indirect
6766
github.com/posener/complete v1.2.3 // indirect
67+
github.com/reugn/go-quartz v0.15.2 // indirect
68+
github.com/robfig/cron/v3 v3.0.1 // indirect
6869
github.com/shopspring/decimal v1.3.1 // indirect
6970
github.com/spf13/cast v1.5.0 // indirect
7071
github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect
7172
github.com/vmihailenco/msgpack/v5 v5.4.1 // indirect
7273
github.com/vmihailenco/tagparser/v2 v2.0.0 // indirect
7374
github.com/yuin/goldmark v1.7.7 // indirect
7475
github.com/yuin/goldmark-meta v1.1.0 // indirect
75-
github.com/zclconf/go-cty v1.15.0 // indirect
76+
github.com/zclconf/go-cty v1.17.0 // indirect
7677
go.abhg.dev/goldmark/frontmatter v0.2.0 // indirect
77-
golang.org/x/crypto v0.32.0 // indirect
78-
golang.org/x/exp v0.0.0-20230809150735-7b3493d9a819 // indirect
79-
golang.org/x/mod v0.21.0 // indirect
80-
golang.org/x/net v0.34.0 // indirect
81-
golang.org/x/sync v0.10.0 // indirect
82-
golang.org/x/sys v0.29.0 // indirect
83-
golang.org/x/text v0.21.0 // indirect
84-
golang.org/x/tools v0.22.0 // indirect
78+
golang.org/x/crypto v0.43.0 // indirect
79+
golang.org/x/exp v0.0.0-20251023183803-a4bb9ffd2546 // indirect
80+
golang.org/x/mod v0.29.0 // indirect
81+
golang.org/x/net v0.46.0 // indirect
82+
golang.org/x/sync v0.17.0 // indirect
83+
golang.org/x/sys v0.37.0 // indirect
84+
golang.org/x/text v0.30.0 // indirect
85+
golang.org/x/tools v0.38.0 // indirect
8586
google.golang.org/appengine v1.6.8 // indirect
86-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241015192408-796eee8c2d53 // indirect
87-
google.golang.org/grpc v1.69.4 // indirect
88-
google.golang.org/protobuf v1.36.3 // indirect
87+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251103181224-f26f9409b101 // indirect
88+
google.golang.org/grpc v1.76.0 // indirect
89+
google.golang.org/protobuf v1.36.10 // indirect
8990
gopkg.in/yaml.v2 v2.3.0 // indirect
9091
gopkg.in/yaml.v3 v3.0.1 // indirect
9192
)

0 commit comments

Comments
 (0)