Skip to content

Conversation

@bbasata
Copy link
Collaborator

@bbasata bbasata commented Mar 25, 2025

Previously: #15

This PR updates this repo for parity with zclconf/go-cty v1.6.1. The changes remain "Unreleased" with no new release tag for the moment. In fact, this fixes a regression in (unreleased) v1.6.0 -- see CHANGELOG.md in the diff.

This prevents a flood of Dependabot PRs like hashicorp/terraform-plugin-testing#444 for all affected providers.

Verification:

$ git ls-remote upstream refs/tags/v1.6.1^{}
7c4f1e0d1ca9f0324182c90ccc377d812374e916	refs/tags/v1.6.1^{}

$ # Check for non-trivial diffs between this v1.6.1 and upstream v1.6.1
$ GIT_PAGER= git diff -U0 --ignore-matching-lines 'github.com/(hashicorp|zclconf)/go-cty' 7c4f1e0..HEAD -- . ':(exclude).github/CODEOWNERS'

[CHANGELOG.md go.mod go.sum]

$ go1.12 test ./...
ok  	github.com/hashicorp/go-cty/cty	1.254s
ok  	github.com/hashicorp/go-cty/cty/convert	0.966s
ok  	github.com/hashicorp/go-cty/cty/function	0.740s
ok  	github.com/hashicorp/go-cty/cty/function/stdlib	1.035s
ok  	github.com/hashicorp/go-cty/cty/gocty	0.634s
ok  	github.com/hashicorp/go-cty/cty/json	0.887s
ok  	github.com/hashicorp/go-cty/cty/msgpack	1.124s
ok  	github.com/hashicorp/go-cty/cty/set	0.502s

# Check for any un-replaced imports
$  ag zclconf -G '.go$'

apparentlymart and others added 4 commits March 25, 2025 08:58
Sets with the same type and same unknown values are equal enough for
RawEqual's purposes. This commit takes advantage of the setRules's
defined ordering to compare each element of the sets as lists.
@bbasata bbasata requested a review from a team as a code owner March 25, 2025 13:03
@bbasata bbasata mentioned this pull request Mar 25, 2025
@bbasata bbasata merged commit ce534d0 into master Mar 25, 2025
1 check passed
@bbasata bbasata deleted the forward-to-1.6.1 branch March 25, 2025 23:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants