Skip to content

Commit

Permalink
fix: remove autonomy references
Browse files Browse the repository at this point in the history
Some old reference to autonomy were still hanging around. This removes
them.

Signed-off-by: Andrew Rynhard <[email protected]>
  • Loading branch information
andrewrynhard committed Dec 8, 2019
1 parent cf1213a commit d9668e0
Show file tree
Hide file tree
Showing 7 changed files with 86 additions and 82 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ ARG SHA
ARG BUILT
ENV GOOS linux
ENV GOARCH amd64
RUN go build -o /conform-${GOOS}-${GOARCH} -ldflags "-s -w -X \"github.com/autonomy/conform/cmd.Tag=${TAG}\" -X \"github.com/autonomy/conform/cmd.SHA=${SHA}\" -X \"github.com/autonomy/conform/cmd.Built=${BUILT}\"" .
RUN go build -o /conform-${GOOS}-${GOARCH} -ldflags "-s -w -X \"github.com/talos-systems/conform/cmd.Tag=${TAG}\" -X \"github.com/talos-systems/conform/cmd.SHA=${SHA}\" -X \"github.com/talos-systems/conform/cmd.Built=${BUILT}\"" .

ARG TAG
ARG SHA
ARG BUILT
ENV GOOS darwin
ENV GOARCH amd64
RUN go build -o /conform-${GOOS}-${GOARCH} -ldflags "-s -w -X \"github.com/autonomy/conform/cmd.Tag=${TAG}\" -X \"github.com/autonomy/conform/cmd.SHA=${SHA}\" -X \"github.com/autonomy/conform/cmd.Built=${BUILT}\"" .
RUN go build -o /conform-${GOOS}-${GOARCH} -ldflags "-s -w -X \"github.com/talos-systems/conform/cmd.Tag=${TAG}\" -X \"github.com/talos-systems/conform/cmd.SHA=${SHA}\" -X \"github.com/talos-systems/conform/cmd.Built=${BUILT}\"" .

FROM common AS test
ENV GOOS linux
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export DOCKER_BUILDKIT := 1
all: enforce build test image

enforce:
@conform enforce
@go run main.go enforce

.PHONY: build
build:
Expand Down Expand Up @@ -47,7 +47,7 @@ push: image

deps:
@GO111MODULE=on CGO_ENABLED=0 go get -u github.com/autonomy/gitmeta
@GO111MODULE=on CGO_ENABLED=0 go get -u github.com/autonomy/conform
@GO111MODULE=on CGO_ENABLED=0 go get -u github.com/talos-systems/conform

clean:
go clean -modcache
Expand Down
23 changes: 12 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<p align="center">Policy enforcement for your pipelines.</p>
<p align="center">
<a href="https://conventionalcommits.org"><img alt="Conventional Commits" src="https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg?style=flat-square"></a>
<a href="https://godoc.org/github.com/autonomy/conform"><img alt="GoDoc" src="http://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square"></a>
<a href="https://travis-ci.org/autonomy/conform"><img alt="Travis" src="https://img.shields.io/travis/autonomy/conform.svg?style=flat-square"></a>
<a href="https://codecov.io/gh/autonomy/conform"><img alt="Codecov" src="https://img.shields.io/codecov/c/github/autonomy/conform.svg?style=flat-square"></a>
<a href="https://goreportcard.com/report/github.com/autonomy/conform"><img alt="Go Report Card" src="https://goreportcard.com/badge/github.com/autonomy/conform?style=flat-square"></a>
<a href="https://github.com/autonomy/conform/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/autonomy/conform.svg?style=flat-square"></a>
<a href="https://github.com/autonomy/conform/releases/latest"><img alt="GitHub (pre-)release" src="https://img.shields.io/github/release/autonomy/conform/all.svg?style=flat-square"></a>
<a href="https://godoc.org/github.com/talos-systems/conform"><img alt="GoDoc" src="http://img.shields.io/badge/godoc-reference-blue.svg?style=flat-square"></a>
<a href="https://travis-ci.org/talos-systems/conform"><img alt="Travis" src="https://img.shields.io/travis/talos-systems/conform.svg?style=flat-square"></a>
<a href="https://codecov.io/gh/talos-systems/conform"><img alt="Codecov" src="https://img.shields.io/codecov/c/github/talos-systems/conform.svg?style=flat-square"></a>
<a href="https://goreportcard.com/report/github.com/talos-systems/conform"><img alt="Go Report Card" src="https://goreportcard.com/badge/github.com/talos-systems/conform?style=flat-square"></a>
<a href="https://github.com/talos-systems/conform/releases/latest"><img alt="Release" src="https://img.shields.io/github/release/talos-systems/conform.svg?style=flat-square"></a>
<a href="https://github.com/talos-systems/conform/releases/latest"><img alt="GitHub (pre-)release" src="https://img.shields.io/github/release/talos-systems/conform/all.svg?style=flat-square"></a>
</p>
</p>

Expand Down Expand Up @@ -50,12 +50,12 @@ policies:
- type: license
spec:
skipPaths:
- .git/
- .build*/
- .git/
- .build*/
includeSuffixes:
- .ext
- .ext
excludeSuffixes:
- .exclude-ext-prefix.ext
- .exclude-ext-prefix.ext
header: |
This is the contents of a license header.
```
Expand All @@ -75,4 +75,5 @@ license File Header PASS <none>
```

### License
[![license](https://img.shields.io/github/license/autonomy/conform.svg?style=flat-square)](https://github.com/autonomy/conform/blob/master/LICENSE)

[![license](https://img.shields.io/github/license/talos-systems/conform.svg?style=flat-square)](https://github.com/talos-systems/conform/blob/master/LICENSE)
2 changes: 0 additions & 2 deletions cmd/enforce.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ import (
"log"
"os"

"github.com/autonomy/conform/internal/enforcer"
"github.com/autonomy/conform/internal/policy"
"github.com/spf13/cobra"
"github.com/talos-systems/conform/internal/enforcer"
"github.com/talos-systems/conform/internal/policy"
Expand Down
9 changes: 4 additions & 5 deletions cmd/serve.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ var serveCmd = &cobra.Command{
// nolint: errcheck
defer os.RemoveAll(dir)

if err := os.MkdirAll(filepath.Join(dir, "github"), 0700); err != nil {
if err = os.MkdirAll(filepath.Join(dir, "github"), 0700); err != nil {
log.Printf("failed to create github directory: %+v\n", err)
return
}
if err := os.MkdirAll(filepath.Join(dir, "repo"), 0700); err != nil {
if err = os.MkdirAll(filepath.Join(dir, "repo"), 0700); err != nil {
log.Printf("failed to create repo directory: %+v\n", err)
return
}
Expand All @@ -71,8 +71,7 @@ var serveCmd = &cobra.Command{
URL: pullRequestEvent.GetRepo().GetCloneURL(),
Progress: os.Stdout,
})

if err = ioutil.WriteFile(event, payload, 0600); err != nil {
if err != nil {
log.Printf("failed to clone repo: %+v\n", err)
return
}
Expand Down Expand Up @@ -102,7 +101,7 @@ var serveCmd = &cobra.Command{
w.WriteHeader(http.StatusOK)
})

http.ListenAndServe(":3000", nil)
log.Fatal(http.ListenAndServe(":3000", nil))
},
}

Expand Down
24 changes: 23 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,37 @@
module github.com/talos-systems/conform

require (
github.com/autonomy/conform v0.1.0-alpha.16
github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 // indirect
github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect
github.com/deckarep/golang-set v1.7.1 // indirect
github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect
github.com/gliderlabs/ssh v0.2.2 // indirect
github.com/google/go-cmp v0.3.1 // indirect
github.com/google/go-github v17.0.0+incompatible
github.com/google/go-querystring v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect
github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect
github.com/mingrammer/commonregex v1.0.1 // indirect
github.com/mitchellh/go-homedir v1.1.0 // indirect
github.com/mitchellh/mapstructure v0.0.0-20170523030023-d0303fe80992
github.com/montanaflynn/stats v0.5.0 // indirect
github.com/neurosnap/sentences v1.0.6 // indirect
github.com/pkg/errors v0.8.1
github.com/sergi/go-diff v1.0.0 // indirect
github.com/spf13/cobra v0.0.3
github.com/spf13/pflag v1.0.5 // indirect
github.com/src-d/gcfg v1.4.0 // indirect
github.com/xanzy/ssh-agent v0.2.1 // indirect
golang.org/x/crypto v0.0.0-20191206172530-e9b2fee46413 // indirect
golang.org/x/text v0.3.2 // indirect
gonum.org/v1/gonum v0.6.1 // indirect
gopkg.in/jdkato/prose.v2 v2.0.0-20180825173540-767a23049b9e
gopkg.in/neurosnap/sentences.v1 v1.0.6 // indirect
gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect
gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 // indirect
gopkg.in/src-d/go-git.v4 v4.0.0
gopkg.in/warnings.v0 v0.1.2 // indirect
gopkg.in/yaml.v2 v2.2.2
)

Expand Down
Loading

0 comments on commit d9668e0

Please sign in to comment.