Skip to content

Commit

Permalink
Revert "feat: sync upstream changes (#9)"
Browse files Browse the repository at this point in the history 
This reverts commit 3f5c7eb.
  • Loading branch information
@gamunu
gamunu authored Apr 10, 2024
1 parent 3f5c7eb commit 1466b86
Show file tree
Hide file tree
Showing 6 changed files with 61 additions and 110 deletions.
16 changes: 5 additions & 11 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
---
name: build
on:
push:
Expand All @@ -11,9 +12,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Go
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version-file: .go-version
- name: Generate provider schemas
Expand Down Expand Up @@ -43,9 +44,9 @@ jobs:
timeout-minutes: 25
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- name: Set up Go
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0
with:
go-version-file: .go-version
- name: ${{ matrix.goos }} ${{ matrix.goarch }} build
Expand All @@ -54,10 +55,3 @@ jobs:
-trimpath \
-buildvcs=false \
-ldflags "-s -w"
delete-provider-schemas:
needs: build
runs-on: ubuntu-latest
steps:
- uses: geekyeggo/delete-artifact@24928e75e6e6590170563b8ddae9fac674508aa1 # v5.0.0
with:
name: provider-schema-data
44 changes: 0 additions & 44 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,40 +1,3 @@
## 0.33.0 (10 April 2024)

ENHANCEMENTS:

* Support for provider-defined functions ([#1636](https://github.com/hashicorp/terraform-ls/pull/1636))
* Remove `use_legacy_workflow` from S3 backend ([terraform-schema#338](https://github.com/hashicorp/terraform-schema/pull/338))
* Add `issensitive` function ([terraform-schema#340](https://github.com/hashicorp/terraform-schema/pull/340))
* Conclude `module_variable_optional_attrs` language experiment ([terraform-schema#337](https://github.com/hashicorp/terraform-schema/pull/337))

BUG FIXES:

* Only merge provider-defined functions for Terraform >= 1.8 ([#1672](https://github.com/hashicorp/terraform-ls/pull/1672), [terraform-schema#336](https://github.com/hashicorp/terraform-schema/pull/336))

INTERNAL:

* Use Terraform `1.8.0-rc1` for bundling schemas ([#1669](https://github.com/hashicorp/terraform-ls/pull/1669))
* Update net package (updates some more alongside) ([#1677](https://github.com/hashicorp/terraform-ls/pull/1677))
* build(deps): Bump github.com/vektra/mockery/v2 from 2.42.0 to 2.42.2 ([#1662](https://github.com/hashicorp/terraform-ls/pull/1662), [#1680](https://github.com/hashicorp/terraform-ls/pull/1680))
* build(deps): Bump github.com/zclconf/go-cty from 1.14.3 to 1.14.4 ([#1666](https://github.com/hashicorp/terraform-ls/pull/1666))
* build(deps): Bump workflows to latest trusted versions ([#1673](https://github.com/hashicorp/terraform-ls/pull/1673))
* build(deps): Bump golang.org/x/tools from 0.19.0 to 0.20.0 ([#1679](https://github.com/hashicorp/terraform-ls/pull/1679))
* build(deps): Bump github.com/creachadair/jrpc2 from 1.1.2 to 1.2.0 ([#1674](https://github.com/hashicorp/terraform-ls/pull/1674))
* build(deps): Bump github.com/hashicorp/hc-install from 0.6.3 to 0.6.4 ([#1675](https://github.com/hashicorp/terraform-ls/pull/1675))
* build(deps): Bump go.opentelemetry.io/otel/trace from 1.24.0 to 1.25.0 ([#1678](https://github.com/hashicorp/terraform-ls/pull/1678))
* build(deps): Bump go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp from 0.49.0 to 0.50.0 ([#1681](https://github.com/hashicorp/terraform-ls/pull/1681))
* build(deps): Bump go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace from 0.49.0 to 0.50.0 ([#1682](https://github.com/hashicorp/terraform-ls/pull/1682))

## 0.33.0-beta2 (27 March 2024)

ENHANCEMENTS:

* Support for provider-defined functions ([#1636](https://github.com/hashicorp/terraform-ls/pull/1636))

INTERNAL:

* Use Terraform `1.8.0-rc1` for bundling schemas ([#1669](https://github.com/hashicorp/terraform-ls/pull/1669))

## 0.32.8 (11 March 2024)

NOTES / BREAKING CHANGES:
Expand Down Expand Up @@ -63,13 +26,6 @@ INTERNAL:
* build(deps): Bump github.com/algolia/algoliasearch-client-go/v3 from 3.31.0 to 3.31.1 ([#1657](https://github.com/hashicorp/terraform-ls/pull/1657))
* build(deps): Bump github.com/stretchr/testify from 1.8.4 to 1.9.0 ([#1653](https://github.com/hashicorp/terraform-ls/pull/1653))

## 0.33.0-beta1 (29 February 2024)

BUG FIXES:

* Fix panics on `nil` expressions ([hcl-lang#376](https://github.com/hashicorp/hcl-lang/pull/376))
* Fix panics on `nil` expressions in early decoder ([terraform-schema#324](https://github.com/hashicorp/terraform-schema/pull/324))

## 0.32.7 (13 February 2024)

ENHANCEMENTS:
Expand Down
30 changes: 15 additions & 15 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ go 1.22.0
require (
github.com/algolia/algoliasearch-client-go/v3 v3.31.1
github.com/apparentlymart/go-textseg v1.0.0
github.com/creachadair/jrpc2 v1.2.0
github.com/creachadair/jrpc2 v1.1.2
github.com/google/go-cmp v0.6.0
github.com/hashicorp/go-cleanhttp v0.5.2
github.com/hashicorp/go-memdb v1.3.4
github.com/hashicorp/go-multierror v1.1.1
github.com/hashicorp/go-uuid v1.0.3
github.com/hashicorp/go-version v1.6.0
github.com/hashicorp/hc-install v0.6.4
github.com/hashicorp/hcl-lang v0.0.0-20240409100755-d90dc4d98974
github.com/hashicorp/hc-install v0.6.3
github.com/hashicorp/hcl-lang v0.0.0-20240326153306-49d737897778
github.com/hashicorp/hcl/v2 v2.20.1
github.com/hashicorp/terraform-exec v0.20.0
github.com/hashicorp/terraform-json v0.21.0
github.com/hashicorp/terraform-registry-address v0.2.3
github.com/hashicorp/terraform-schema v0.0.0-20240410082006-72025f55ec83
github.com/hashicorp/terraform-schema v0.0.0-20240403100825-364ac130f15a
github.com/mcuadros/go-defaults v1.2.0
github.com/mh-cbon/go-fmt-fail v0.0.0-20160815164508-67765b3fbcb5
github.com/mitchellh/cli v1.1.5
Expand All @@ -27,34 +27,34 @@ require (
github.com/otiai10/copy v1.14.0
github.com/pmezard/go-difflib v1.0.0
github.com/stretchr/testify v1.9.0
github.com/vektra/mockery/v2 v2.42.2
github.com/vektra/mockery/v2 v2.42.1
github.com/zclconf/go-cty v1.14.4
github.com/zclconf/go-cty-debug v0.0.0-20191215020915-b22d67c1ba0b
go.bobheadxi.dev/gobenchdata v1.3.1
go.opentelemetry.io/otel/trace v1.25.0
golang.org/x/tools v0.20.0
go.opentelemetry.io/otel/trace v1.24.0
golang.org/x/tools v0.19.0
)

require (
github.com/apparentlymart/go-textseg/v15 v15.0.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
go.opentelemetry.io/otel/metric v1.25.0 // indirect
go.opentelemetry.io/otel/metric v1.24.0 // indirect
)

require (
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver/v3 v3.2.1 // indirect
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.2 // indirect
github.com/ProtonMail/go-crypto v1.1.0-alpha.0 // indirect
github.com/agext/levenshtein v1.2.2 // indirect
github.com/antonmedv/expr v1.10.5 // indirect
github.com/armon/go-radix v1.0.0 // indirect
github.com/bgentry/speakeasy v0.1.0 // indirect
github.com/chigopher/pathlib v0.19.1 // indirect
github.com/cloudflare/circl v1.3.7 // indirect
github.com/creachadair/mds v0.13.4 // indirect
github.com/creachadair/mds v0.3.0 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/djherbis/buffer v1.2.0 // indirect
github.com/djherbis/nio/v3 v3.0.1 // indirect
Expand Down Expand Up @@ -94,13 +94,13 @@ require (
github.com/stretchr/objx v0.5.2 // indirect
github.com/subosito/gotenv v1.4.2 // indirect
go.bobheadxi.dev/streamline v1.2.1 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.50.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.50.0
go.opentelemetry.io/otel v1.25.0
go.opentelemetry.io/contrib/instrumentation/net/http/httptrace/otelhttptrace v0.49.0
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0
go.opentelemetry.io/otel v1.24.0
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/mod v0.16.0 // indirect
golang.org/x/net v0.24.0 // indirect
golang.org/x/sync v0.7.0 // indirect
golang.org/x/sync v0.6.0 // indirect
golang.org/x/sys v0.19.0 // indirect
golang.org/x/term v0.19.0 // indirect
golang.org/x/text v0.14.0 // indirect
Expand Down
Loading

0 comments on commit 1466b86

Please sign in to comment.