Skip to content

Commit

Permalink
Initial Updates
Browse files Browse the repository at this point in the history
  • Loading branch information
straubt1 committed Sep 19, 2024
1 parent e363211 commit c5822b3
Show file tree
Hide file tree
Showing 8 changed files with 139 additions and 553 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
- name: Install Go
uses: actions/setup-go@v4
with:
go-version: 1.21.0
go-version: 1.23.1
- name: Install gox
run: |
go get github.com/mitchellh/gox
Expand Down
6 changes: 3 additions & 3 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -212,12 +212,12 @@
"mode": "auto",
"program": "${fileDirname}/../main.go",
"args": [
"workspace",
"variable",
"create",
"-w=tfx-test",
"-w=tfx-test-tfc",
"-k=variable7",
"-v=./map.hcl",
"--hcl"
"-v=saydfghjasgfhjgasjhgfkhjasgfjgkahfhjkasjkhfghasjgfhjgsdjfhgashjgfhjgsahjfkgsagfashfgsgf676satyfuyasgdf7asifdgsauydf76sd7f6sa76df876saf87a6s7fd6saf="
]
},
{
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,18 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [v0.1.3] - TBD

**Added**

**Changed**

* Updated go to v1.23
* Updated all go packages to latest
* Fixed Workspace Variable Create when the value passed in would error in the `isFile()` function.
* Bumped Docker to alpine:3.20.3


## [v0.1.2] - 2023.10.13

**Added**
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.18.3
FROM alpine:3.20.3

COPY tfx /usr/bin/tfx
ENTRYPOINT ["/usr/bin/tfx"]
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
build:
go build -o bin/main main.go
go build -v \
-ldflags="-X '$(shell git remote get-url --push origin | sed 's/https\?:\/\///' | sed 's/\.git//g')/version.Version=0.1.2' \
-ldflags="-X '$(shell git remote get-url --push origin | sed 's/https\?:\/\///' | sed 's/\.git//g')/version.Version=0.1.3' \
-X '$(shell git remote get-url --push origin | sed 's/https\?:\/\///' | sed 's/\.git//g')/version.Prerelease=alpha' \
-X '$(shell git remote get-url --push origin | sed 's/https\?:\/\///' | sed 's/\.git//g')/version.Build=local' \
-X '$(shell git remote get-url --push origin | sed 's/https\?:\/\///' | sed 's/\.git//g')/version.BuiltBy=$(shell git config --global --get github.user)' \
Expand Down
8 changes: 7 additions & 1 deletion cmd/helper_file.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,15 @@ import (
)

func isFile(filename string) bool {
if f, err := os.Stat(filename); errors.Is(err, os.ErrNotExist) || f.IsDir() {
f, err := os.Stat(filename)
if err != nil || f == nil {
return false
}

if f.IsDir() {
return false
}

return true
}

Expand Down
63 changes: 33 additions & 30 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,73 +1,76 @@
module github.com/straubt1/tfx

go 1.21
go 1.23

toolchain go1.23.1

require (
code.cloudfoundry.org/bytefmt v0.0.0-20231017140541-3b893ed0421b
code.cloudfoundry.org/bytefmt v0.10.0
github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de
github.com/cavaliergopher/grab/v3 v3.0.1
github.com/coreos/go-semver v0.3.1
github.com/fatih/color v1.15.0
github.com/hashicorp/go-slug v0.13.1
github.com/hashicorp/go-tfe v1.38.0
github.com/fatih/color v1.17.0
github.com/hashicorp/go-slug v0.16.0
github.com/hashicorp/go-tfe v1.66.0
github.com/jedib0t/go-pretty v4.3.0+incompatible
github.com/jedib0t/go-pretty/v6 v6.4.9
github.com/jedib0t/go-pretty/v6 v6.5.9
github.com/logrusorgru/aurora v2.0.3+incompatible
github.com/mitchellh/go-homedir v1.1.0
github.com/mmcdole/gofeed v1.2.1
github.com/mmcdole/gofeed v1.3.0
github.com/pkg/errors v0.9.1
github.com/spf13/cobra v1.7.0
github.com/spf13/cobra v1.8.1
github.com/spf13/pflag v1.0.5
github.com/spf13/viper v1.17.0
github.com/spf13/viper v1.19.0
github.com/tidwall/sjson v1.2.5
)

require (
github.com/PuerkitoBio/goquery v1.8.1 // indirect
github.com/PuerkitoBio/goquery v1.10.0 // indirect
github.com/andybalholm/cascadia v1.3.2 // indirect
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
github.com/go-openapi/errors v0.20.4 // indirect
github.com/go-openapi/strfmt v0.21.7 // indirect
github.com/hashicorp/go-version v1.6.0 // indirect
github.com/go-openapi/errors v0.22.0 // indirect
github.com/go-openapi/strfmt v0.23.0 // indirect
github.com/google/uuid v1.6.0 // indirect
github.com/hashicorp/go-version v1.7.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/mmcdole/goxpp v1.1.0 // indirect
github.com/mmcdole/goxpp v1.1.1 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/oklog/ulid v1.3.1 // indirect
github.com/sagikazarmark/locafero v0.3.0 // indirect
github.com/sagikazarmark/locafero v0.6.0 // indirect
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
github.com/sourcegraph/conc v0.3.0 // indirect
go.mongodb.org/mongo-driver v1.12.1 // indirect
go.mongodb.org/mongo-driver v1.17.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/sync v0.4.0 // indirect
golang.org/x/net v0.29.0 // indirect
golang.org/x/sync v0.8.0 // indirect
)

require (
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/google/go-querystring v1.1.0 // indirect
github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
github.com/hashicorp/go-retryablehttp v0.7.4 // indirect
github.com/hashicorp/go-retryablehttp v0.7.7 // indirect
github.com/hashicorp/hcl v1.0.0 // indirect
github.com/hashicorp/jsonapi v0.0.0-20231023233540-b6a3d216e521 // indirect
github.com/hashicorp/jsonapi v1.3.1 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/magiconair/properties v1.8.7 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
github.com/mattn/go-runewidth v0.0.16 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/spf13/afero v1.10.0 // indirect
github.com/spf13/cast v1.5.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
github.com/rivo/uniseg v0.4.7 // indirect
github.com/spf13/afero v1.11.0 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/subosito/gotenv v1.6.0 // indirect
github.com/tidwall/gjson v1.17.0 // indirect
github.com/tidwall/gjson v1.17.3 // indirect
github.com/tidwall/match v1.1.1 // indirect
github.com/tidwall/pretty v1.2.1 // indirect
golang.org/x/exp v0.0.0-20231006140011-7918f672742d
golang.org/x/sys v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0
golang.org/x/sys v0.25.0 // indirect
golang.org/x/text v0.18.0 // indirect
golang.org/x/time v0.6.0 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)
Loading

0 comments on commit c5822b3

Please sign in to comment.