Skip to content

Commit

Permalink
Fix dependecy issues
Browse files Browse the repository at this point in the history
  • Loading branch information
noahschepers-valid committed Jun 11, 2021
1 parent 7a33176 commit b1eaa02
Show file tree
Hide file tree
Showing 10 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ release: zip
hub release create $(VERSION) -m "$(VERSION)" -a release/$(APP)_$(VERSION)_osx_x86_64.tar.gz -a release/$(APP)_$(VERSION)_windows_x86_64.zip -a release/$(APP)_$(VERSION)_linux_x86_64.tar.gz -a release/$(APP)_$(VERSION)_windows_x86_32.zip -a release/$(APP)_$(VERSION)_linux_x86_32.tar.gz -a release/$(APP)_$(VERSION)_linux_arm64.tar.gz

README.md:
go get github.com/keilerkonzept/$(APP) && <README.template.md subst \
go get github.com/ValidUSA/$(APP) && <README.template.md subst \
EXAMPLES_MAIN_TF="$$(cat examples/main.tf)"\
EXAMPLE_PRETTY="$$($(APP) check examples)"\
EXAMPLE_LIST="$$($(APP) list -o json examples | jq .)"\
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,11 +72,11 @@ module "consul_github_ssh" {
}
module "example_git_ssh_branch" {
source = "git::ssh://git@github.com/keilerkonzept/terraform-module-versions?ref=master"
source = "git::ssh://git@github.com/ValidUSA/terraform-module-versions?ref=master"
}
module "example_git_scp" {
source = "git::git@github.com:keilerkonzept/terraform-module-versions?ref=0.12.0"
source = "git::git@github.com:ValidUSA/terraform-module-versions?ref=0.12.0"
version = "~> 0.12"
}
Expand All @@ -96,8 +96,8 @@ $ terraform-module-versions list examples
|----------|---------------------------------|------------|---------|------------------------------------------------------------------------------|
| registry | consul | ~0.7.3 | | hashicorp/consul/aws |
| local | local | | | ./local |
| git | example_git_ssh_branch | | master | git::ssh://git@github.com/keilerkonzept/terraform-module-versions?ref=master |
| git | example_git_scp | ~> 0.12 | 0.12.0 | git::git@github.com:keilerkonzept/terraform-module-versions?ref=0.12.0 |
| git | example_git_ssh_branch | | master | git::ssh://git@github.com/ValidUSA/terraform-module-versions?ref=master |
| git | example_git_scp | ~> 0.12 | 0.12.0 | git::git@github.com:ValidUSA/terraform-module-versions?ref=0.12.0 |
| git | consul_github_ssh | ~0.1.0 | 0.1.0 | git@github.com:hashicorp/terraform-aws-consul?ref=0.1.0 |
| git | consul_github_https_no_ref | | | github.com/hashicorp/terraform-aws-consul |
| git | consul_github_https_missing_ref | 0.7.3 | | github.com/hashicorp/terraform-aws-consul |
Expand Down Expand Up @@ -147,15 +147,15 @@ with `-o json`:
"path": "examples/main.tf",
"name": "example_git_scp",
"type": "git",
"source": "git::git@github.com:keilerkonzept/terraform-module-versions?ref=0.12.0",
"source": "git::git@github.com:ValidUSA/terraform-module-versions?ref=0.12.0",
"constraint": "~> 0.12",
"version": "0.12.0"
},
{
"path": "examples/main.tf",
"name": "example_git_ssh_branch",
"type": "git",
"source": "git::ssh://git@github.com/keilerkonzept/terraform-module-versions?ref=master",
"source": "git::ssh://git@github.com/ValidUSA/terraform-module-versions?ref=master",
"version": "master"
},
{
Expand Down Expand Up @@ -296,10 +296,10 @@ with `-o json`:
Using go get:

```bash
go get -u github.com/keilerkonzept/terraform-module-versions
go get -u github.com/ValidUSA/terraform-module-versions
```

Or [download the binary for your platform](https://github.com/keilerkonzept/terraform-module-versions/releases/latest) from the releases page.
Or [download the binary for your platform](https://github.com/ValidUSA/terraform-module-versions/releases/latest) from the releases page.

## Usage

Expand Down
4 changes: 2 additions & 2 deletions README.template.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ ${EXAMPLE_UPDATES_SINGLE}
Using go get:

```bash
go get -u github.com/keilerkonzept/${APP}
go get -u github.com/ValidUSA/${APP}
```

Or [download the binary for your platform](https://github.com/keilerkonzept/${APP}/releases/latest) from the releases page.
Or [download the binary for your platform](https://github.com/ValidUSA/${APP}/releases/latest) from the releases page.

## Usage

Expand Down
4 changes: 2 additions & 2 deletions examples/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ module "consul_github_ssh" {
}

module "example_git_ssh_branch" {
source = "git::ssh://git@github.com/keilerkonzept/terraform-module-versions?ref=master"
source = "git::ssh://git@github.com/ValidUSA/terraform-module-versions?ref=master"
}

module "example_git_scp" {
source = "git::git@github.com:keilerkonzept/terraform-module-versions?ref=0.12.0"
source = "git::git@github.com:ValidUSA/terraform-module-versions?ref=0.12.0"
version = "~> 0.12"
}

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/keilerkonzept/terraform-module-versions
module github.com/ValidUSA/terraform-module-versions

go 1.15

Expand Down
12 changes: 6 additions & 6 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ import (
"strings"
"unicode"

"github.com/keilerkonzept/terraform-module-versions/pkg/httputil"
"github.com/keilerkonzept/terraform-module-versions/pkg/modulecall"
"github.com/keilerkonzept/terraform-module-versions/pkg/output"
"github.com/keilerkonzept/terraform-module-versions/pkg/registry"
"github.com/keilerkonzept/terraform-module-versions/pkg/scan"
"github.com/keilerkonzept/terraform-module-versions/pkg/update"
"github.com/ValidUSA/terraform-module-versions/pkg/httputil"
"github.com/ValidUSA/terraform-module-versions/pkg/modulecall"
"github.com/ValidUSA/terraform-module-versions/pkg/output"
"github.com/ValidUSA/terraform-module-versions/pkg/registry"
"github.com/ValidUSA/terraform-module-versions/pkg/scan"
"github.com/ValidUSA/terraform-module-versions/pkg/update"

"github.com/peterbourgon/ff/v3/ffcli"
"github.com/sgreben/flagvar"
Expand Down
2 changes: 1 addition & 1 deletion pkg/modulecall/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/Masterminds/semver/v3"
"github.com/hashicorp/terraform-config-inspect/tfconfig"
"github.com/keilerkonzept/terraform-module-versions/pkg/source"
"github.com/ValidUSA/terraform-module-versions/pkg/source"
)

type Parsed struct {
Expand Down
12 changes: 6 additions & 6 deletions pkg/source/source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ func TestParse(t *testing.T) {
},
},
{
raw: "git::ssh://git@github.com/keilerkonzept/terraform-module-versions?ref=0.10.0",
raw: "git::ssh://git@github.com/ValidUSA/terraform-module-versions?ref=0.10.0",
want: &Source{
Git: &Git{
Remote: "ssh://git@github.com/keilerkonzept/terraform-module-versions",
Remote: "ssh://git@github.com/ValidUSA/terraform-module-versions",
RefValue: stringPtr("0.10.0"),
},
},
Expand All @@ -48,19 +48,19 @@ func TestParse(t *testing.T) {
},
},
{
raw: "git::git@github.com:keilerkonzept/terraform-module-versions?ref=0.12.0",
raw: "git::git@github.com:ValidUSA/terraform-module-versions?ref=0.12.0",
want: &Source{
Git: &Git{
Remote: "ssh://git@github.com/keilerkonzept/terraform-module-versions",
Remote: "ssh://git@github.com/ValidUSA/terraform-module-versions",
RefValue: stringPtr("0.12.0"),
},
},
},
{
raw: "git::git@github.com:keilerkonzept/terraform-module-versions//pkg/registry?ref=0.12.0",
raw: "git::git@github.com:ValidUSA/terraform-module-versions//pkg/registry?ref=0.12.0",
want: &Source{
Git: &Git{
Remote: "ssh://git@github.com/keilerkonzept/terraform-module-versions",
Remote: "ssh://git@github.com/ValidUSA/terraform-module-versions",
RefValue: stringPtr("0.12.0"),
RemotePath: stringPtr("pkg/registry"),
},
Expand Down
6 changes: 3 additions & 3 deletions pkg/update/updates.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"github.com/Masterminds/semver/v3"
"github.com/go-git/go-git/v5/plumbing/transport"
"github.com/keilerkonzept/terraform-module-versions/pkg/registry"
"github.com/keilerkonzept/terraform-module-versions/pkg/source"
"github.com/keilerkonzept/terraform-module-versions/pkg/versions"
"github.com/ValidUSA/terraform-module-versions/pkg/registry"
"github.com/ValidUSA/terraform-module-versions/pkg/source"
"github.com/ValidUSA/terraform-module-versions/pkg/versions"
)

type Client struct {
Expand Down
2 changes: 1 addition & 1 deletion pkg/versions/registry.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"sort"

"github.com/Masterminds/semver/v3"
"github.com/keilerkonzept/terraform-module-versions/pkg/registry"
"github.com/ValidUSA/terraform-module-versions/pkg/registry"
)

func Registry(client registry.Client, hostname, namespace, name, provider string) ([]*semver.Version, error) {
Expand Down

0 comments on commit b1eaa02

Please sign in to comment.