Skip to content
This repository has been archived by the owner on Jun 11, 2024. It is now read-only.

Commit

Permalink
Github Org Rename (#10)
Browse files Browse the repository at this point in the history
* fix: org rename imports patch

* fix: removed deprecated goreleaser settings

* fix: deprecated golangci-lint configuration

* fix: update github actions versions

---------

Co-authored-by: brittonhayes <[email protected]>
  • Loading branch information
brittonhayes and brittonhayes authored Jul 30, 2023
1 parent c304e8c commit a2d0daf
Show file tree
Hide file tree
Showing 60 changed files with 462 additions and 325 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1 +1 @@
* @SlalomBuild/fusion-contributors
* @slalombuild/fusion-contributors
14 changes: 7 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v3
with:
go-version: 1.18
- name: Run GoReleaser and release executables
uses: goreleaser/goreleaser-action@v2
with:
version: latest
args: release --rm-dist
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Expand All @@ -37,23 +37,23 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2
uses: actions/checkout@v3

- name: Log in to the Container registry
uses: docker/login-action@f054a8b539a109f9f41c372932f1ae047eff08c9
uses: docker/login-action@v2
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
uses: docker/metadata-action@v2
with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}

- name: Build and push Docker image
uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
uses: docker/build-push-action@v2
with:
context: .
push: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code into the Go module directory
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0

Expand Down
45 changes: 24 additions & 21 deletions .golangci.yaml
Original file line number Diff line number Diff line change
@@ -1,37 +1,40 @@
linters:
enable:
- gofmt
- goimports
- errcheck
- nestif
- wrapcheck
- depguard
- gosimple
- goconst
- gomodguard
- gofmt
- goimports
- errcheck
- nestif
- wrapcheck
- depguard
- gosimple
- goconst
- gomodguard
issues:
fix: true
exclude-rules:
- path: '(.+)_test\.go'
linters:
- depguard
- path: '(.+)_test\.go'
linters:
- depguard

linters-settings:
gosimple:
go: "1.17"
checks: ["all"]
wrapcheck:
ignorePackageGlobs:
- github.com/SlalomBuild/fusion/*
- github.com/slalombuild/fusion/*
depguard:
include-go-root: true
packages-with-error-message:
- log: 'logging is allowed only by github.com/rs/zerolog/log'
- github.com/tj/assert: 'assert is allowed only by github.com/stretchr/testify/assert'
rules:
main:
deny:
- pkg: 'log'
desc: 'logging is allowed only by github.com/rs/zerolog/log'
- pkg: github.com/tj/assert
desc: 'assert is allowed only by github.com/stretchr/testify/assert'
gomodguard:
blocked:
modules:
- github.com/tj/assert:
recommendations:
- github.com/stretchr/testify/assert
reason: "testify assert is the preferred testing library for this project"
- github.com/tj/assert:
recommendations:
- github.com/stretchr/testify/assert
reason: "testify assert is the preferred testing library for this project"
2 changes: 1 addition & 1 deletion .gomarkdoc.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
output: "{{.Dir}}/README.md"
repository:
url: https://github.com/SlalomBuild/fusion
url: https://github.com/slalombuild/fusion
defaultBranch: main
path: /
101 changes: 54 additions & 47 deletions .goreleaser.yaml
Original file line number Diff line number Diff line change
@@ -1,43 +1,50 @@
before:
hooks:
- go mod tidy
- go mod tidy
builds:
- id: "fusion"
main: "./cmd/fusion"
binary: "fusion"
goos:
- linux
- windows
- darwin
- id: "fusionctl"
main: "./cmd/fusionctl"
binary: "fusionctl"
goos:
- linux
- windows
- darwin
- id: "fusion"
main: "./cmd/fusion"
binary: "fusion"
goos:
- linux
- windows
- darwin
goarch:
- amd64
- arm
- arm64
- id: "fusionctl"
main: "./cmd/fusionctl"
binary: "fusionctl"
goos:
- linux
- windows
- darwin
goarch:
- amd64
- arm64
brews:
- name: fusion
homepage: "https://github.com/SlalomBuild/fusion"
description: "Generate secure by default cloud infrastructure configuration with Go and Terraform"
license: "MIT"
goarm: "6"
tap:
owner: SlalomBuild
name: fusion
url_template: "https://github.com/SlalomBuild/fusion/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
commit_author:
name: goreleaserbot
email: [email protected]
- name: fusion
homepage: "https://github.com/slalombuild/fusion"
description: "Generate secure by default cloud infrastructure configuration with Go and Terraform"
license: "MIT"
goarm: "6"
repository:
owner: slalombuild
name: fusion
url_template: "https://github.com/slalombuild/fusion/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
commit_author:
name: goreleaserbot
email: [email protected]

scoop:
url_template: "https://github.com/SlalomBuild/fusion/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
bucket:
owner: SlalomBuild
name: fusion
commit_author:
name: goreleaserbot
email: [email protected]
scoops:
- url_template: "https://github.com/slalombuild/fusion/releases/download/{{ .Tag }}/{{ .ArtifactName }}"
repository:
owner: slalombuild
name: fusion
commit_author:
name: goreleaserbot
email: [email protected]

checksum:
name_template: "checksums.txt"
Expand All @@ -46,18 +53,18 @@ snapshot:
changelog:
sort: asc
groups:
- title: Features
regexp: "^.*feat[(\\w)]*:+.*$"
order: 0
- title: 'Bug fixes'
regexp: "^.*fix[(\\w)]*:+.*$"
order: 1
- title: Others
order: 999
- title: Features
regexp: "^.*feat[(\\w)]*:+.*$"
order: 0
- title: 'Bug fixes'
regexp: "^.*fix[(\\w)]*:+.*$"
order: 1
- title: Others
order: 999

filters:
exclude:
- "^docs:"
- "^test:"
- "^images:"
- "^_examples:"
- "^docs:"
- "^test:"
- "^images:"
- "^_examples:"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ COPY . /src/
RUN CGO_ENABLED=0 go build -v -o /bin/fusion cmd/fusion/main.go

LABEL author="Slalom Build"
LABEL github="https://github.com/SlalomBuild/fusion"
LABEL github="https://github.com/slalombuild/fusion"

ENTRYPOINT ["/bin/fusion"]

Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# 🧬 fusion

[![Go Reference](https://pkg.go.dev/badge/github.com/SlalomBuild/fusion.svg)](https://pkg.go.dev/github.com/SlalomBuild/fusion)
![Latest Release](https://img.shields.io/github/v/release/SlalomBuild/fusion?label=latest%20release)
[![Go Report Card](https://goreportcard.com/badge/github.com/SlalomBuild/fusion)](https://goreportcard.com/report/github.com/SlalomBuild/fusion)
[![Go Reference](https://pkg.go.dev/badge/github.com/slalombuild/fusion.svg)](https://pkg.go.dev/github.com/slalombuild/fusion)
![Latest Release](https://img.shields.io/github/v/release/slalombuild/fusion?label=latest%20release)
[![Go Report Card](https://goreportcard.com/badge/github.com/slalombuild/fusion)](https://goreportcard.com/report/github.com/slalombuild/fusion)

Generate secure by default cloud infrastructure configuration with Go and Terraform.

Expand All @@ -15,13 +15,13 @@ Install the fusion cli
If you have Go setup on your system, you can install fusion with `go install`

```shell
go install github.com/SlalomBuild/fusion/cmd/fusion@latest
go install github.com/slalombuild/fusion/cmd/fusion@latest
```

### Homebrew

```shell
brew tap SlalomBuild/fusion
brew tap slalombuild/fusion
brew install fusion

# Optionally install the fusionctl dev tool
Expand All @@ -31,7 +31,7 @@ brew install fusionctl
### Scoop

```shell
scoop bucket add fusion https://github.com/SlalomBuild/fusion.git
scoop bucket add fusion https://github.com/slalombuild/fusion.git
scoop install fusion
```

Expand Down Expand Up @@ -101,7 +101,7 @@ fusion gen snippets -e intellij -o filename.xml

## Contributions

Is there a feature that you'd like to see implemented in Fusion? Feel free to open a [Feature Request](https://github.com/SlalomBuild/fusion/issues/new?assignees=&labels=enhancement&template=feature_request.yml&title=%28short+issue+description%29) issue to let us know what you'd like to see!
We encourage submitting [Pull Requests](https://github.com/SlalomBuild/fusion/pulls) directly to add terraform resources to the library
Is there a feature that you'd like to see implemented in Fusion? Feel free to open a [Feature Request](https://github.com/slalombuild/fusion/issues/new?assignees=&labels=enhancement&template=feature_request.yml&title=%28short+issue+description%29) issue to let us know what you'd like to see!
We encourage submitting [Pull Requests](https://github.com/slalombuild/fusion/pulls) directly to add terraform resources to the library

For detailed development instructions, view our [DEVELOPMENT](.github/DEVELOPMENT.md) and [CONTRIBUTING](.github/CONTRIBUTING.md) guidelines.
Loading

0 comments on commit a2d0daf

Please sign in to comment.