From 0299d3ee1262a4e9aed0c96e14f94c4b51c5d74f Mon Sep 17 00:00:00 2001 From: Luke Kysow Date: Tue, 6 Feb 2018 13:09:29 -0800 Subject: [PATCH] Move to new atlantisnorth repo --- .circleci/config.yml | 10 +-- CHANGELOG.md | 68 +++++++++---------- CONTRIBUTING.md | 14 ++-- Dockerfile | 1 - Makefile | 2 +- README.md | 14 ++-- bootstrap/bootstrap.go | 6 +- cmd/bootstrap.go | 2 +- cmd/server.go | 2 +- cmd/server_test.go | 6 +- e2e/.gitconfig | 4 +- e2e/main.go | 2 +- main.go | 2 +- scripts/coverage.sh | 2 +- server/events/apply_executor.go | 10 +-- server/events/atlantis_workspace.go | 4 +- .../events/atlantis_workspace_locker_test.go | 4 +- server/events/command_context.go | 6 +- server/events/command_handler.go | 8 +-- server/events/command_handler_test.go | 28 ++++---- server/events/commit_status_updater.go | 4 +- server/events/commit_status_updater_test.go | 10 +-- server/events/event_parser.go | 4 +- server/events/event_parser_test.go | 12 ++-- server/events/help_executor_test.go | 4 +- server/events/locking/boltdb/boltdb.go | 2 +- server/events/locking/boltdb/boltdb_test.go | 6 +- server/events/locking/locking.go | 2 +- server/events/locking/locking_test.go | 10 +-- .../mocks/matchers/locking_trylockresponse.go | 2 +- .../map_of_string_to_models_projectlock.go | 2 +- .../locking/mocks/matchers/models_project.go | 2 +- .../mocks/matchers/models_projectlock.go | 2 +- .../mocks/matchers/models_pullrequest.go | 2 +- .../locking/mocks/matchers/models_user.go | 2 +- .../matchers/ptr_to_models_projectlock.go | 2 +- .../matchers/slice_of_models_projectlock.go | 2 +- server/events/locking/mocks/mock_backend.go | 4 +- server/events/locking/mocks/mock_locker.go | 6 +- server/events/markdown_renderer_test.go | 4 +- .../mocks/matchers/events_commandresponse.go | 2 +- .../mocks/matchers/events_preexecuteresult.go | 2 +- .../mocks/matchers/events_projectconfig.go | 2 +- .../events/mocks/matchers/models_project.go | 2 +- .../mocks/matchers/models_pullrequest.go | 2 +- server/events/mocks/matchers/models_repo.go | 2 +- server/events/mocks/matchers/models_user.go | 2 +- .../mocks/matchers/ptr_to_events_command.go | 2 +- .../matchers/ptr_to_events_commandcontext.go | 2 +- .../matchers/ptr_to_logging_simplelogger.go | 2 +- .../mocks/matchers/slice_of_models_project.go | 2 +- .../events/mocks/matchers/vcs_commitstatus.go | 2 +- server/events/mocks/matchers/vcs_host.go | 2 +- .../events/mocks/mock_atlantis_workspace.go | 6 +- .../mocks/mock_atlantis_workspace_locker.go | 2 +- server/events/mocks/mock_command_runner.go | 8 +-- .../mocks/mock_commit_status_updater.go | 8 +-- server/events/mocks/mock_event_parsing.go | 8 +-- server/events/mocks/mock_executor.go | 4 +- .../events/mocks/mock_github_pull_getter.go | 4 +- .../mocks/mock_gitlab_merge_request_getter.go | 2 +- .../events/mocks/mock_lock_url_generator.go | 2 +- .../mocks/mock_project_config_reader.go | 4 +- server/events/mocks/mock_project_finder.go | 6 +- .../events/mocks/mock_project_pre_executor.go | 6 +- server/events/mocks/mock_pull_cleaner.go | 6 +- server/events/models/fixtures/fixtures.go | 10 +-- server/events/models/models.go | 8 +-- server/events/plan_executor.go | 10 +-- server/events/plan_executor_test.go | 22 +++--- server/events/project_config_test.go | 4 +- server/events/project_finder.go | 4 +- server/events/project_finder_test.go | 6 +- server/events/project_pre_execute.go | 8 +-- server/events/project_pre_execute_test.go | 18 ++--- server/events/project_result.go | 2 +- server/events/pull_closed_executor.go | 6 +- server/events/pull_closed_executor_test.go | 18 ++--- .../matchers/ptr_to_logging_simplelogger.go | 2 +- server/events/run/mocks/mock_runner.go | 4 +- server/events/run/run.go | 2 +- server/events/run/run_test.go | 4 +- .../matchers/ptr_to_logging_simplelogger.go | 2 +- .../terraform/mocks/mock_terraform_client.go | 4 +- server/events/terraform/terraform_client.go | 2 +- .../events/terraform/terraform_client_test.go | 4 +- server/events/vcs/client.go | 2 +- server/events/vcs/github_client.go | 2 +- server/events/vcs/gitlab_client.go | 2 +- .../vcs/mocks/matchers/models_pullrequest.go | 2 +- .../events/vcs/mocks/matchers/models_repo.go | 2 +- .../vcs/mocks/matchers/vcs_commitstatus.go | 2 +- server/events/vcs/mocks/matchers/vcs_host.go | 2 +- server/events/vcs/mocks/mock_client.go | 6 +- server/events/vcs/mocks/mock_proxy.go | 6 +- .../events/vcs/not_configured_vcs_client.go | 2 +- server/events/vcs/proxy.go | 2 +- .../matchers/ptr_to_logging_simplelogger.go | 2 +- .../mocks/matchers/webhooks_applyresult.go | 2 +- server/events/webhooks/mocks/mock_sender.go | 6 +- .../webhooks/mocks/mock_slack_client.go | 4 +- .../mocks/mock_underlying_slack_client.go | 2 +- server/events/webhooks/slack.go | 2 +- server/events/webhooks/slack_client_test.go | 16 ++--- server/events/webhooks/slack_test.go | 8 +-- server/events/webhooks/webhooks.go | 4 +- server/events/webhooks/webhooks_test.go | 8 +-- server/events_controller.go | 8 +-- server/events_controller_test.go | 16 ++--- server/github_request_validator_test.go | 4 +- server/gitlab_request_parser_test.go | 4 +- .../mocks/matchers/logging_loglevel.go | 2 +- server/logging/mocks/mock_simple_logging.go | 4 +- server/middleware.go | 2 +- server/mocks/mock_github_request_validator.go | 2 +- server/mocks/mock_gitlab_request_parser.go | 2 +- server/mocks/mock_template_writer.go | 2 +- server/server.go | 18 ++--- server/server_test.go | 12 ++-- website/src/config.toml | 4 +- website/src/content/blog/atlantis-release.md | 6 +- website/src/themes/kube/layouts/index.html | 4 +- .../themes/kube/layouts/partials/footer.html | 2 +- .../themes/kube/layouts/partials/header.html | 2 +- 124 files changed, 344 insertions(+), 345 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c6186dec5..02dc50c68f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,7 +1,7 @@ version: 2 jobs: build: - working_directory: /go/src/github.com/hootsuite/atlantis + working_directory: /go/src/github.com/atlantisnorth/atlantis docker: - image: circleci/golang:1.9.2 environment: @@ -38,14 +38,14 @@ jobs: name: Build image command: | if [ "${CIRCLE_BRANCH}" == "master" ]; then - docker build -t hootsuite/atlantis:latest . + docker build -t atlantisnorth/atlantis:latest . fi - run: name: Push image command: | if [ "${CIRCLE_BRANCH}" == "master" ]; then docker login -u "$DOCKER_USER" -p "$DOCKER_PASSWORD" - docker push hootsuite/atlantis:latest + docker push atlantisnorth/atlantis:latest fi - run: name: Tag and push version if exists @@ -54,7 +54,7 @@ jobs: command: | if [ "${CIRCLE_BRANCH}" == "master" ]; then for TAG in $(git tag --contains $CIRCLE_SHA1); do - docker tag hootsuite/atlantis:latest hootsuite/atlantis:$TAG - docker push hootsuite/atlantis:$TAG + docker tag atlantisnorth/atlantis:latest atlantisnorth/atlantis:$TAG + docker push atlantisnorth/atlantis:$TAG done fi diff --git a/CHANGELOG.md b/CHANGELOG.md index d5cc67ccc4..03cd145ae2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,10 @@ None ## Downloads -* [atlantis_darwin_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.4/atlantis_darwin_amd64.zip) -* [atlantis_linux_386.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.4/atlantis_linux_386.zip) -* [atlantis_linux_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.4/atlantis_linux_amd64.zip) -* [atlantis_linux_arm.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.4/atlantis_linux_arm.zip) +* [atlantis_darwin_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.4/atlantis_darwin_amd64.zip) +* [atlantis_linux_386.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.4/atlantis_linux_386.zip) +* [atlantis_linux_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.4/atlantis_linux_amd64.zip) +* [atlantis_linux_arm.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.4/atlantis_linux_arm.zip) # v0.2.3 ## Features @@ -25,10 +25,10 @@ None None ## Downloads -* [atlantis_darwin_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.3/atlantis_darwin_amd64.zip) -* [atlantis_linux_386.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.3/atlantis_linux_386.zip) -* [atlantis_linux_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.3/atlantis_linux_amd64.zip) -* [atlantis_linux_arm.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.3/atlantis_linux_arm.zip) +* [atlantis_darwin_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.3/atlantis_darwin_amd64.zip) +* [atlantis_linux_386.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.3/atlantis_linux_386.zip) +* [atlantis_linux_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.3/atlantis_linux_amd64.zip) +* [atlantis_linux_arm.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.3/atlantis_linux_arm.zip) # v0.2.2 ## Features @@ -47,10 +47,10 @@ None This is safe to do because you'll just need to re-run `plan` to get your plan back. ## Downloads -* [atlantis_darwin_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.2/atlantis_darwin_amd64.zip) -* [atlantis_linux_386.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.2/atlantis_linux_386.zip) -* [atlantis_linux_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.2/atlantis_linux_amd64.zip) -* [atlantis_linux_arm.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.2/atlantis_linux_arm.zip) +* [atlantis_darwin_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.2/atlantis_darwin_amd64.zip) +* [atlantis_linux_386.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.2/atlantis_linux_386.zip) +* [atlantis_linux_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.2/atlantis_linux_amd64.zip) +* [atlantis_linux_arm.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.2/atlantis_linux_arm.zip) # v0.2.1 ## Features @@ -63,10 +63,10 @@ This is safe to do because you'll just need to re-run `plan` to get your plan ba None ## Downloads -* [atlantis_darwin_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.1/atlantis_darwin_amd64.zip) -* [atlantis_linux_386.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.1/atlantis_linux_386.zip) -* [atlantis_linux_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.1/atlantis_linux_amd64.zip) -* [atlantis_linux_arm.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.1/atlantis_linux_arm.zip) +* [atlantis_darwin_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.1/atlantis_darwin_amd64.zip) +* [atlantis_linux_386.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.1/atlantis_linux_386.zip) +* [atlantis_linux_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.1/atlantis_linux_amd64.zip) +* [atlantis_linux_arm.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.1/atlantis_linux_arm.zip) # v0.2.0 ## Features @@ -80,10 +80,10 @@ None None ## Downloads -* [atlantis_darwin_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.0/atlantis_darwin_amd64.zip) -* [atlantis_linux_386.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.0/atlantis_linux_386.zip) -* [atlantis_linux_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.0/atlantis_linux_amd64.zip) -* [atlantis_linux_arm.zip](https://github.com/hootsuite/atlantis/releases/download/v0.2.0/atlantis_linux_arm.zip) +* [atlantis_darwin_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.0/atlantis_darwin_amd64.zip) +* [atlantis_linux_386.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.0/atlantis_linux_386.zip) +* [atlantis_linux_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.0/atlantis_linux_amd64.zip) +* [atlantis_linux_arm.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.2.0/atlantis_linux_arm.zip) # v0.1.3 ## Features @@ -98,10 +98,10 @@ None None ## Downloads -* [atlantis_darwin_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.3/atlantis_darwin_amd64.zip) -* [atlantis_linux_386.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.3/atlantis_linux_386.zip) -* [atlantis_linux_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.3/atlantis_linux_amd64.zip) -* [atlantis_linux_arm.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.3/atlantis_linux_arm.zip) +* [atlantis_darwin_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.3/atlantis_darwin_amd64.zip) +* [atlantis_linux_386.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.3/atlantis_linux_386.zip) +* [atlantis_linux_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.3/atlantis_linux_amd64.zip) +* [atlantis_linux_arm.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.3/atlantis_linux_arm.zip) # v0.1.2 ## Features @@ -112,10 +112,10 @@ None * Plan and Apply outputs are shown in new line. ([#132](https://github.com/hootsuite/atlantis/pull/132)) ## Downloads -* [atlantis_darwin_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.2/atlantis_darwin_amd64.zip) -* [atlantis_linux_386.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.2/atlantis_linux_386.zip) -* [atlantis_linux_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.2/atlantis_linux_amd64.zip) -* [atlantis_linux_arm.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.2/atlantis_linux_arm.zip) +* [atlantis_darwin_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.2/atlantis_darwin_amd64.zip) +* [atlantis_linux_386.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.2/atlantis_linux_386.zip) +* [atlantis_linux_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.2/atlantis_linux_amd64.zip) +* [atlantis_linux_arm.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.2/atlantis_linux_arm.zip) # v0.1.1 ## Backwards Incompatibilities / Notes: @@ -123,11 +123,11 @@ None assume role session with the GitHub username of the user running the Atlantis command use the `atlantis_user` terraform variable alongside Terraform's [built-in support](https://www.terraform.io/docs/providers/aws/#assume-role) for assume role -(see https://github.com/hootsuite/atlantis/blob/master/README.md#assume-role-session-names) +(see https://github.com/atlantisnorth/atlantis/blob/master/README.md#assume-role-session-names) * Atlantis has a docker image now ([#123](https://github.com/hootsuite/atlantis/pull/123)). Here is how you can try it out: ```bash -docker run hootsuite/atlantis:v0.1.1 server --gh-user=GITHUB_USERNAME --gh-token=GITHUB_TOKEN +docker run atlantisnorth/atlantis:v0.1.1 server --gh-user=GITHUB_USERNAME --gh-token=GITHUB_TOKEN ``` ## Improvements @@ -137,7 +137,7 @@ docker run hootsuite/atlantis:v0.1.1 server --gh-user=GITHUB_USERNAME --gh-token ## Downloads -* [atlantis_darwin_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.1/atlantis_darwin_amd64.zip) -* [atlantis_linux_386.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.1/atlantis_linux_386.zip) -* [atlantis_linux_amd64.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.1/atlantis_linux_amd64.zip) -* [atlantis_linux_arm.zip](https://github.com/hootsuite/atlantis/releases/download/v0.1.1/atlantis_linux_arm.zip) +* [atlantis_darwin_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.1/atlantis_darwin_amd64.zip) +* [atlantis_linux_386.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.1/atlantis_linux_386.zip) +* [atlantis_linux_amd64.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.1/atlantis_linux_amd64.zip) +* [atlantis_linux_arm.zip](https://github.com/atlantisnorth/atlantis/releases/download/v0.1.1/atlantis_linux_arm.zip) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 9c049127a2..e70fa4fc1c 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -3,13 +3,13 @@ ## Running Atlantis Locally Get the source code: ``` -go get github.com/hootsuite/atlantis +go get github.com/atlantisnorth/atlantis ``` -This will clone Atlantis into `$GOPATH/src/github.com/hootsuite/atlantis` (where `$GOPATH` defaults to `~/go`). +This will clone Atlantis into `$GOPATH/src/github.com/atlantisnorth/atlantis` (where `$GOPATH` defaults to `~/go`). Go to that directory: ``` -cd $GOPATH/src/github.com/hootsuite/atlantis +cd $GOPATH/src/github.com/atlantisnorth/atlantis ``` Compile Atlantis: @@ -25,7 +25,7 @@ If you get an error like `command not found: atlantis`, ensure that `$GOPATH/bin ## Calling Your Local Atlantis From GitHub - Create a test terraform repository in your GitHub. -- Create a personal access token for Atlantis. See [Create a GitHub token](https://github.com/hootsuite/atlantis#create-a-github-token). +- Create a personal access token for Atlantis. See [Create a GitHub token](https://github.com/atlantisnorth/atlantis#create-a-github-token). - Start Atlantis in server mode using that token: ``` atlantis server --gh-user --gh-token --log-level debug @@ -35,7 +35,7 @@ atlantis server --gh-user --gh-token --log-level de ``` ngrok http 4141 ``` -- Create a WebHook in your repo and use the `https` url that `ngrok` printed out after running `ngrok http 4141`. Be sure to append `/events` so your webhook url looks something like `https://efce3bcd.ngrok.io/events`. See [Add GitHub Webhook](https://github.com/hootsuite/atlantis#add-github-webhook). +- Create a WebHook in your repo and use the `https` url that `ngrok` printed out after running `ngrok http 4141`. Be sure to append `/events` so your webhook url looks something like `https://efce3bcd.ngrok.io/events`. See [Add GitHub Webhook](https://github.com/atlantisnorth/atlantis#add-github-webhook). - Create a pull request and type `atlantis help`. You should see the request in the `ngrok` and Atlantis logs and you should also see Atlantis comment back. ## Code Style @@ -70,7 +70,7 @@ This is easier to read and more consistent ### Testing - place tests under `{package under test}_test` to enforce testing the external interfaces - if you need to test internally i.e. access non-exported stuff, call the file `{file under test}_internal_test.go` -- use our testing utility for easier-to-read assertions: `import . "github.com/hootsuite/atlantis/testing"` and then use `Assert()`, `Equals()` and `Ok()` +- use our testing utility for easier-to-read assertions: `import . "github.com/atlantisnorth/atlantis/testing"` and then use `Assert()`, `Equals()` and `Ok()` - don't try to describe the whole test by its function name. Instead use `t.Log` statements: ```go // don't do this @@ -94,7 +94,7 @@ func TestLockingExisting(t *testing.T) { 1. Create a pull request and merge to master 1. Check out master and fetch latest 1. Run `make release` -1. Go to https://github.com/hootsuite/atlantis/releases and click "Draft a new release" +1. Go to https://github.com/atlantisnorth/atlantis/releases and click "Draft a new release" 1. Prefix version with `v` 1. The title of the release is the same as the tag (ex. v0.2.2) 1. Description should just be `See CHANGELOG` with link to CHANGELOG at that release, ex: `See [CHANGELOG](CHANGELOG.md#v022)` diff --git a/Dockerfile b/Dockerfile index d6f3a9f9d6..b208dff086 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,5 @@ FROM alpine:3.6 LABEL authors="Anubhav Mishra, Luke Kysow" -LABEL maintainer="anubhav.mishra@hootsuite.com,luke.kysow@hootsuite.com" # create atlantis user RUN addgroup atlantis && \ diff --git a/Makefile b/Makefile index 51cf7cce37..77ed02db45 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ BUILD_ID := $(shell git rev-parse --short HEAD 2>/dev/null || echo no-commit-id) WORKSPACE := $(shell pwd) PKG := $(shell go list ./... | grep -v e2e | grep -v vendor | grep -v static) -IMAGE_NAME := hootsuite/atlantis +IMAGE_NAME := atlantisnorth/atlantis .PHONY: test diff --git a/README.md b/README.md index 2446ac5eee..3d467caad1 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Read about [Why We Built Atlantis](https://www.atlantis.run/blog/atlantis-release/) -[![CircleCI](https://circleci.com/gh/hootsuite/atlantis/tree/master.svg?style=shield&circle-token=08bf5b34233b0e168a9dd73e01cafdcf7dc4bf16)](https://circleci.com/gh/hootsuite/atlantis/tree/master) +[![CircleCI](https://circleci.com/gh/atlantisnorth/atlantis/tree/master.svg?style=shield)](https://circleci.com/gh/atlantisnorth/atlantis/tree/master) [![SuperDopeBadge](https://img.shields.io/badge/Hightower-extra%20dope-b9f2ff.svg)](https://twitter.com/kelseyhightower/status/893260922222813184) [![Slack Status](https://thawing-headland-22460.herokuapp.com/badge.svg)](https://thawing-headland-22460.herokuapp.com) @@ -51,10 +51,10 @@ Read about [Why We Built Atlantis](https://www.atlantis.run/blog/atlantis-releas ## Atlantis Works With * GitHub (public, private or enterprise) and GitLab (public, private or enterprise) * Any Terraform version (see [Terraform Versions](#terraform-version)) -* Can be run with a [single binary](https://github.com/hootsuite/atlantis/releases) or with our [Docker image](https://hub.docker.com/r/hootsuite/atlantis/) +* Can be run with a [single binary](https://github.com/atlantisnorth/atlantis/releases) or with our [Docker image](https://hub.docker.com/r/atlantisnorth/atlantis/) ## Getting Started -Download from [https://github.com/hootsuite/atlantis/releases](https://github.com/hootsuite/atlantis/releases) +Download from [https://github.com/atlantisnorth/atlantis/releases](https://github.com/atlantisnorth/atlantis/releases) Run ``` @@ -326,7 +326,7 @@ Atlantis is now running! Atlantis also ships inside a docker image. Run the docker image: ```bash -docker run hootsuite/atlantis:latest server +docker run atlantisnorth/atlantis:latest server ``` #### Usage @@ -338,7 +338,7 @@ vim Dockerfile-custom ``` ```dockerfile -FROM hootsuite/atlantis +FROM atlantisnorth/atlantis # copy a terraform binary of the version you need COPY terraform /usr/local/bin/terraform @@ -361,7 +361,7 @@ docker run {YOUR_DOCKER_ORG}/atlantis-custom server --gh-user=GITHUB_USERNAME -- If you'd like to test out Atlantis before running it on your own repositories you can fork our example repo. -- Fork https://github.com/hootsuite/atlantis-example +- Fork https://github.com/atlantisnorth/atlantis-example - If you didn't add the Webhook as to your organization add Atlantis as a Webhook to the forked repo (see [Add GitHub Webhook](#add-github-webhook)) - Now that Atlantis can receive events you should be able to comment on a pull request to trigger Atlantis. Create a pull request - Click **Branches** on your forked repo's homepage @@ -487,7 +487,7 @@ See `atlantis server --help` for more information. ## Contributing -Want to contribute? Check out [CONTRIBUTING](https://github.com/hootsuite/atlantis/blob/master/CONTRIBUTING.md). +Want to contribute? Check out [CONTRIBUTING](https://github.com/atlantisnorth/atlantis/blob/master/CONTRIBUTING.md). Thank you to these awesome contributors! - [@nicholas-wu-hs](https://github.com/nicholas-wu-hs) diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go index fc94789fb3..3d1d8e287a 100644 --- a/bootstrap/bootstrap.go +++ b/bootstrap/bootstrap.go @@ -19,7 +19,7 @@ import ( "github.com/pkg/errors" ) -var terraformExampleRepoOwner = "hootsuite" +var terraformExampleRepoOwner = "atlantis-north" var terraformExampleRepo = "atlantis-example" var bootstrapDescription = `[white]Welcome to Atlantis bootstrap! @@ -35,7 +35,7 @@ var pullRequestBody = "In this pull request we will learn how to use atlantis. T "* Start by typing `atlantis help` in the comments.\n" + "* Next, lets plan by typing `atlantis plan` in the comments. That will run a `terraform plan`.\n" + "* Now lets apply that plan. Type `atlantis apply` in the comments. This will run a `terraform apply`.\n" + - "\nThank you for trying out atlantis. For more info on running atlantis in production see https://github.com/hootsuite/atlantis" + "\nThank you for trying out atlantis. For more info on running atlantis in production see https://github.com/atlantisnorth/atlantis" // Start begins the bootstrap process. // nolint: errcheck @@ -195,6 +195,6 @@ Follow these instructions to create a token (we don't store any tokens): signal.Notify(signalChan, syscall.SIGINT, syscall.SIGTERM) <-signalChan colorstring.Println("\n[red]shutdown signal received, exiting....") - colorstring.Println("\n[green]Thank you for using atlantis :) \n[white]For more information about how to use atlantis in production go to: https://github.com/hootsuite/atlantis") + colorstring.Println("\n[green]Thank you for using atlantis :) \n[white]For more information about how to use atlantis in production go to: https://github.com/atlantisnorth/atlantis") return nil } diff --git a/cmd/bootstrap.go b/cmd/bootstrap.go index 1001906535..12c2e368e3 100644 --- a/cmd/bootstrap.go +++ b/cmd/bootstrap.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/hootsuite/atlantis/bootstrap" + "github.com/atlantisnorth/atlantis/bootstrap" "github.com/spf13/cobra" ) diff --git a/cmd/server.go b/cmd/server.go index 7b977214fd..5e2ded05bf 100644 --- a/cmd/server.go +++ b/cmd/server.go @@ -5,7 +5,7 @@ import ( "os" "strings" - "github.com/hootsuite/atlantis/server" + "github.com/atlantisnorth/atlantis/server" "github.com/mitchellh/go-homedir" "github.com/pkg/errors" "github.com/spf13/cobra" diff --git a/cmd/server_test.go b/cmd/server_test.go index b3fdc4d434..cd5ac0ad4b 100644 --- a/cmd/server_test.go +++ b/cmd/server_test.go @@ -6,9 +6,9 @@ import ( "strings" "testing" - "github.com/hootsuite/atlantis/cmd" - "github.com/hootsuite/atlantis/server" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/cmd" + "github.com/atlantisnorth/atlantis/server" + . "github.com/atlantisnorth/atlantis/testing" "github.com/mitchellh/go-homedir" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/e2e/.gitconfig b/e2e/.gitconfig index 320325ead1..43da800f32 100644 --- a/e2e/.gitconfig +++ b/e2e/.gitconfig @@ -1,3 +1,3 @@ [user] - name = Anubhav Mishra - email = anubhav.mishra@hootsuite.com + name = Luke Kysow + email = lkysow+atlantis@gmail.com \ No newline at end of file diff --git a/e2e/main.go b/e2e/main.go index f817495fed..5356f177e3 100644 --- a/e2e/main.go +++ b/e2e/main.go @@ -42,7 +42,7 @@ func main() { atlantisURL = fmt.Sprintf("%s/events", atlantisURL) ownerName := os.Getenv("GITHUB_REPO_OWNER_NAME") if ownerName == "" { - ownerName = "hootsuite" + ownerName = "atlantisnorth" } repoName := os.Getenv("GITHUB_REPO_NAME") if repoName == "" { diff --git a/main.go b/main.go index 7545b0c9bb..92545e6d1c 100644 --- a/main.go +++ b/main.go @@ -2,7 +2,7 @@ package main import ( - "github.com/hootsuite/atlantis/cmd" + "github.com/atlantisnorth/atlantis/cmd" "github.com/spf13/viper" ) diff --git a/scripts/coverage.sh b/scripts/coverage.sh index afd3beaabb..60963ce821 100755 --- a/scripts/coverage.sh +++ b/scripts/coverage.sh @@ -6,7 +6,7 @@ # with multiple packages, see https://code.google.com/p/go/issues/detail?id=6909 # # Usage: coverage.sh packages... -# Example: coverage.sh github.com/hootsuite/atlantis github.com/hootsuite/atlantis/bootstrap +# Example: coverage.sh github.com/atlantisnorth/atlantis github.com/atlantisnorth/atlantis/bootstrap # set -e diff --git a/server/events/apply_executor.go b/server/events/apply_executor.go index 61dda71c60..d1137336cc 100644 --- a/server/events/apply_executor.go +++ b/server/events/apply_executor.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/run" - "github.com/hootsuite/atlantis/server/events/terraform" - "github.com/hootsuite/atlantis/server/events/vcs" - "github.com/hootsuite/atlantis/server/events/webhooks" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/run" + "github.com/atlantisnorth/atlantis/server/events/terraform" + "github.com/atlantisnorth/atlantis/server/events/vcs" + "github.com/atlantisnorth/atlantis/server/events/webhooks" "github.com/pkg/errors" ) diff --git a/server/events/atlantis_workspace.go b/server/events/atlantis_workspace.go index 650fd8ab33..c97c6f059c 100644 --- a/server/events/atlantis_workspace.go +++ b/server/events/atlantis_workspace.go @@ -6,8 +6,8 @@ import ( "path/filepath" "strconv" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/logging" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/logging" "github.com/pkg/errors" ) diff --git a/server/events/atlantis_workspace_locker_test.go b/server/events/atlantis_workspace_locker_test.go index 04527d7443..536c08048d 100644 --- a/server/events/atlantis_workspace_locker_test.go +++ b/server/events/atlantis_workspace_locker_test.go @@ -3,8 +3,8 @@ package events_test import ( "testing" - "github.com/hootsuite/atlantis/server/events" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events" + . "github.com/atlantisnorth/atlantis/testing" ) var repo = "repo/owner" diff --git a/server/events/command_context.go b/server/events/command_context.go index e43421efa6..0340d35816 100644 --- a/server/events/command_context.go +++ b/server/events/command_context.go @@ -1,9 +1,9 @@ package events import ( - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/vcs" - "github.com/hootsuite/atlantis/server/logging" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/vcs" + "github.com/atlantisnorth/atlantis/server/logging" ) // CommandContext represents the context of a command that came from a comment diff --git a/server/events/command_handler.go b/server/events/command_handler.go index d7d1c9b06d..702b32d053 100644 --- a/server/events/command_handler.go +++ b/server/events/command_handler.go @@ -3,11 +3,11 @@ package events import ( "fmt" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/vcs" + "github.com/atlantisnorth/atlantis/server/logging" + "github.com/atlantisnorth/atlantis/server/recovery" "github.com/google/go-github/github" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/vcs" - "github.com/hootsuite/atlantis/server/logging" - "github.com/hootsuite/atlantis/server/recovery" "github.com/lkysow/go-gitlab" "github.com/pkg/errors" ) diff --git a/server/events/command_handler_test.go b/server/events/command_handler_test.go index c7a8f93c98..dad34f64c0 100644 --- a/server/events/command_handler_test.go +++ b/server/events/command_handler_test.go @@ -7,16 +7,16 @@ import ( "strings" "testing" + "github.com/atlantisnorth/atlantis/server/events" + "github.com/atlantisnorth/atlantis/server/events/mocks" + "github.com/atlantisnorth/atlantis/server/events/mocks/matchers" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/models/fixtures" + "github.com/atlantisnorth/atlantis/server/events/vcs" + vcsmocks "github.com/atlantisnorth/atlantis/server/events/vcs/mocks" + logmocks "github.com/atlantisnorth/atlantis/server/logging/mocks" + . "github.com/atlantisnorth/atlantis/testing" "github.com/google/go-github/github" - "github.com/hootsuite/atlantis/server/events" - "github.com/hootsuite/atlantis/server/events/mocks" - "github.com/hootsuite/atlantis/server/events/mocks/matchers" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/models/fixtures" - "github.com/hootsuite/atlantis/server/events/vcs" - vcsmocks "github.com/hootsuite/atlantis/server/events/vcs/mocks" - logmocks "github.com/hootsuite/atlantis/server/logging/mocks" - . "github.com/hootsuite/atlantis/testing" . "github.com/petergtz/pegomock" ) @@ -75,7 +75,7 @@ func TestExecuteCommand_NoGithubPullGetter(t *testing.T) { setup(t) ch.GithubPullGetter = nil ch.ExecuteCommand(fixtures.Repo, fixtures.Repo, fixtures.User, 1, nil, vcs.Github) - Equals(t, "[ERROR] hootsuite/atlantis#1: Atlantis not configured to support GitHub\n", logBytes.String()) + Equals(t, "[ERROR] atlantisnorth/atlantis#1: Atlantis not configured to support GitHub\n", logBytes.String()) } func TestExecuteCommand_NoGitlabMergeGetter(t *testing.T) { @@ -83,7 +83,7 @@ func TestExecuteCommand_NoGitlabMergeGetter(t *testing.T) { setup(t) ch.GitlabMergeRequestGetter = nil ch.ExecuteCommand(fixtures.Repo, fixtures.Repo, fixtures.User, 1, nil, vcs.Gitlab) - Equals(t, "[ERROR] hootsuite/atlantis#1: Atlantis not configured to support GitLab\n", logBytes.String()) + Equals(t, "[ERROR] atlantisnorth/atlantis#1: Atlantis not configured to support GitLab\n", logBytes.String()) } func TestExecuteCommand_GithubPullErr(t *testing.T) { @@ -91,7 +91,7 @@ func TestExecuteCommand_GithubPullErr(t *testing.T) { setup(t) When(githubGetter.GetPullRequest(fixtures.Repo, fixtures.Pull.Num)).ThenReturn(nil, errors.New("err")) ch.ExecuteCommand(fixtures.Repo, fixtures.Repo, fixtures.User, fixtures.Pull.Num, nil, vcs.Github) - Equals(t, "[ERROR] hootsuite/atlantis#1: Making pull request API call to GitHub: err\n", logBytes.String()) + Equals(t, "[ERROR] atlantisnorth/atlantis#1: Making pull request API call to GitHub: err\n", logBytes.String()) } func TestExecuteCommand_GitlabMergeRequestErr(t *testing.T) { @@ -99,7 +99,7 @@ func TestExecuteCommand_GitlabMergeRequestErr(t *testing.T) { setup(t) When(gitlabGetter.GetMergeRequest(fixtures.Repo.FullName, fixtures.Pull.Num)).ThenReturn(nil, errors.New("err")) ch.ExecuteCommand(fixtures.Repo, fixtures.Repo, fixtures.User, fixtures.Pull.Num, nil, vcs.Gitlab) - Equals(t, "[ERROR] hootsuite/atlantis#1: Making merge request API call to GitLab: err\n", logBytes.String()) + Equals(t, "[ERROR] atlantisnorth/atlantis#1: Making merge request API call to GitLab: err\n", logBytes.String()) } func TestExecuteCommand_GithubPullParseErr(t *testing.T) { @@ -110,7 +110,7 @@ func TestExecuteCommand_GithubPullParseErr(t *testing.T) { When(eventParsing.ParseGithubPull(&pull)).ThenReturn(fixtures.Pull, fixtures.Repo, errors.New("err")) ch.ExecuteCommand(fixtures.Repo, fixtures.Repo, fixtures.User, fixtures.Pull.Num, nil, vcs.Github) - Equals(t, "[ERROR] hootsuite/atlantis#1: Extracting required fields from comment data: err\n", logBytes.String()) + Equals(t, "[ERROR] atlantisnorth/atlantis#1: Extracting required fields from comment data: err\n", logBytes.String()) } func TestExecuteCommand_ClosedPull(t *testing.T) { diff --git a/server/events/commit_status_updater.go b/server/events/commit_status_updater.go index 8c6bbe85f2..8a34c839ae 100644 --- a/server/events/commit_status_updater.go +++ b/server/events/commit_status_updater.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/vcs" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/vcs" ) //go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_commit_status_updater.go CommitStatusUpdater diff --git a/server/events/commit_status_updater_test.go b/server/events/commit_status_updater_test.go index 50ce5b6295..823517b3f4 100644 --- a/server/events/commit_status_updater_test.go +++ b/server/events/commit_status_updater_test.go @@ -5,11 +5,11 @@ import ( "strings" "testing" - "github.com/hootsuite/atlantis/server/events" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/vcs" - "github.com/hootsuite/atlantis/server/events/vcs/mocks" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/vcs" + "github.com/atlantisnorth/atlantis/server/events/vcs/mocks" + . "github.com/atlantisnorth/atlantis/testing" . "github.com/petergtz/pegomock" ) diff --git a/server/events/event_parser.go b/server/events/event_parser.go index 4f15954dc4..4f3113d08a 100644 --- a/server/events/event_parser.go +++ b/server/events/event_parser.go @@ -5,9 +5,9 @@ import ( "fmt" "strings" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/vcs" "github.com/google/go-github/github" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/vcs" "github.com/lkysow/go-gitlab" ) diff --git a/server/events/event_parser_test.go b/server/events/event_parser_test.go index 869e8e2422..4d18bf9029 100644 --- a/server/events/event_parser_test.go +++ b/server/events/event_parser_test.go @@ -8,12 +8,12 @@ import ( "encoding/json" + "github.com/atlantisnorth/atlantis/server/events" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/vcs" + . "github.com/atlantisnorth/atlantis/server/events/vcs/fixtures" + . "github.com/atlantisnorth/atlantis/testing" "github.com/google/go-github/github" - "github.com/hootsuite/atlantis/server/events" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/vcs" - . "github.com/hootsuite/atlantis/server/events/vcs/fixtures" - . "github.com/hootsuite/atlantis/testing" "github.com/lkysow/go-gitlab" "github.com/mohae/deepcopy" ) @@ -165,7 +165,7 @@ func TestParseGithubIssueCommentEvent(t *testing.T) { Issue: &github.Issue{ Number: github.Int(1), User: &github.User{Login: github.String("issue_user")}, - HTMLURL: github.String("https://github.com/hootsuite/atlantis/issues/1"), + HTMLURL: github.String("https://github.com/atlantisnorth/atlantis/issues/1"), }, Comment: &github.IssueComment{ User: &github.User{Login: github.String("comment_user")}, diff --git a/server/events/help_executor_test.go b/server/events/help_executor_test.go index 40a2277e5d..adf3dd92e1 100644 --- a/server/events/help_executor_test.go +++ b/server/events/help_executor_test.go @@ -3,8 +3,8 @@ package events_test import ( "testing" - "github.com/hootsuite/atlantis/server/events" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events" + . "github.com/atlantisnorth/atlantis/testing" ) func TestExecute(t *testing.T) { diff --git a/server/events/locking/boltdb/boltdb.go b/server/events/locking/boltdb/boltdb.go index c8a1f11ffc..132ac3a382 100644 --- a/server/events/locking/boltdb/boltdb.go +++ b/server/events/locking/boltdb/boltdb.go @@ -11,8 +11,8 @@ import ( "path" "time" + "github.com/atlantisnorth/atlantis/server/events/models" "github.com/boltdb/bolt" - "github.com/hootsuite/atlantis/server/events/models" "github.com/pkg/errors" ) diff --git a/server/events/locking/boltdb/boltdb_test.go b/server/events/locking/boltdb/boltdb_test.go index f89e397bc4..5a4ef28519 100644 --- a/server/events/locking/boltdb/boltdb_test.go +++ b/server/events/locking/boltdb/boltdb_test.go @@ -6,10 +6,10 @@ import ( "testing" "time" + "github.com/atlantisnorth/atlantis/server/events/locking/boltdb" + "github.com/atlantisnorth/atlantis/server/events/models" + . "github.com/atlantisnorth/atlantis/testing" "github.com/boltdb/bolt" - "github.com/hootsuite/atlantis/server/events/locking/boltdb" - "github.com/hootsuite/atlantis/server/events/models" - . "github.com/hootsuite/atlantis/testing" "github.com/pkg/errors" ) diff --git a/server/events/locking/locking.go b/server/events/locking/locking.go index 4f10888485..d0876a9d13 100644 --- a/server/events/locking/locking.go +++ b/server/events/locking/locking.go @@ -7,7 +7,7 @@ import ( "regexp" "time" - "github.com/hootsuite/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/models" ) //go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_backend.go Backend diff --git a/server/events/locking/locking_test.go b/server/events/locking/locking_test.go index 148758137a..8e0c902056 100644 --- a/server/events/locking/locking_test.go +++ b/server/events/locking/locking_test.go @@ -7,11 +7,11 @@ import ( "strings" - "github.com/hootsuite/atlantis/server/events/locking" - "github.com/hootsuite/atlantis/server/events/locking/mocks" - "github.com/hootsuite/atlantis/server/events/locking/mocks/matchers" - "github.com/hootsuite/atlantis/server/events/models" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events/locking" + "github.com/atlantisnorth/atlantis/server/events/locking/mocks" + "github.com/atlantisnorth/atlantis/server/events/locking/mocks/matchers" + "github.com/atlantisnorth/atlantis/server/events/models" + . "github.com/atlantisnorth/atlantis/testing" . "github.com/petergtz/pegomock" ) diff --git a/server/events/locking/mocks/matchers/locking_trylockresponse.go b/server/events/locking/mocks/matchers/locking_trylockresponse.go index 52e99c493d..8d829a7acb 100644 --- a/server/events/locking/mocks/matchers/locking_trylockresponse.go +++ b/server/events/locking/mocks/matchers/locking_trylockresponse.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - locking "github.com/hootsuite/atlantis/server/events/locking" + locking "github.com/atlantisnorth/atlantis/server/events/locking" "github.com/petergtz/pegomock" ) diff --git a/server/events/locking/mocks/matchers/map_of_string_to_models_projectlock.go b/server/events/locking/mocks/matchers/map_of_string_to_models_projectlock.go index 5b71f04565..c81c89386f 100644 --- a/server/events/locking/mocks/matchers/map_of_string_to_models_projectlock.go +++ b/server/events/locking/mocks/matchers/map_of_string_to_models_projectlock.go @@ -5,7 +5,7 @@ import ( "github.com/petergtz/pegomock" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" ) func AnyMapOfStringToModelsProjectLock() map[string]models.ProjectLock { diff --git a/server/events/locking/mocks/matchers/models_project.go b/server/events/locking/mocks/matchers/models_project.go index a80bb254f6..fbf125edc9 100644 --- a/server/events/locking/mocks/matchers/models_project.go +++ b/server/events/locking/mocks/matchers/models_project.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/locking/mocks/matchers/models_projectlock.go b/server/events/locking/mocks/matchers/models_projectlock.go index 7180b4ceea..9b313641b0 100644 --- a/server/events/locking/mocks/matchers/models_projectlock.go +++ b/server/events/locking/mocks/matchers/models_projectlock.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/locking/mocks/matchers/models_pullrequest.go b/server/events/locking/mocks/matchers/models_pullrequest.go index e5fc2e7949..a85e4cea02 100644 --- a/server/events/locking/mocks/matchers/models_pullrequest.go +++ b/server/events/locking/mocks/matchers/models_pullrequest.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/locking/mocks/matchers/models_user.go b/server/events/locking/mocks/matchers/models_user.go index 38095f7b1f..c525ec5098 100644 --- a/server/events/locking/mocks/matchers/models_user.go +++ b/server/events/locking/mocks/matchers/models_user.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/locking/mocks/matchers/ptr_to_models_projectlock.go b/server/events/locking/mocks/matchers/ptr_to_models_projectlock.go index 0ac613fcb9..0e6ad80d0e 100644 --- a/server/events/locking/mocks/matchers/ptr_to_models_projectlock.go +++ b/server/events/locking/mocks/matchers/ptr_to_models_projectlock.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/locking/mocks/matchers/slice_of_models_projectlock.go b/server/events/locking/mocks/matchers/slice_of_models_projectlock.go index d08209e629..cb282f1b86 100644 --- a/server/events/locking/mocks/matchers/slice_of_models_projectlock.go +++ b/server/events/locking/mocks/matchers/slice_of_models_projectlock.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/locking/mocks/mock_backend.go b/server/events/locking/mocks/mock_backend.go index 2f5494f4f8..96fb5f1101 100644 --- a/server/events/locking/mocks/mock_backend.go +++ b/server/events/locking/mocks/mock_backend.go @@ -1,12 +1,12 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events/locking (interfaces: Backend) +// Source: github.com/atlantisnorth/atlantis/server/events/locking (interfaces: Backend) package mocks import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/locking/mocks/mock_locker.go b/server/events/locking/mocks/mock_locker.go index bff1311e78..890a7288e2 100644 --- a/server/events/locking/mocks/mock_locker.go +++ b/server/events/locking/mocks/mock_locker.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events/locking (interfaces: Locker) +// Source: github.com/atlantisnorth/atlantis/server/events/locking (interfaces: Locker) package mocks import ( "reflect" - locking "github.com/hootsuite/atlantis/server/events/locking" - models "github.com/hootsuite/atlantis/server/events/models" + locking "github.com/atlantisnorth/atlantis/server/events/locking" + models "github.com/atlantisnorth/atlantis/server/events/models" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/markdown_renderer_test.go b/server/events/markdown_renderer_test.go index c4a8e674e3..26e4c0a330 100644 --- a/server/events/markdown_renderer_test.go +++ b/server/events/markdown_renderer_test.go @@ -4,8 +4,8 @@ import ( "errors" "testing" - "github.com/hootsuite/atlantis/server/events" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events" + . "github.com/atlantisnorth/atlantis/testing" ) func TestRenderErr(t *testing.T) { diff --git a/server/events/mocks/matchers/events_commandresponse.go b/server/events/mocks/matchers/events_commandresponse.go index 988584fce7..8b1bedfee0 100644 --- a/server/events/mocks/matchers/events_commandresponse.go +++ b/server/events/mocks/matchers/events_commandresponse.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - events "github.com/hootsuite/atlantis/server/events" + events "github.com/atlantisnorth/atlantis/server/events" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/events_preexecuteresult.go b/server/events/mocks/matchers/events_preexecuteresult.go index 20dd823f60..35409dd9e5 100644 --- a/server/events/mocks/matchers/events_preexecuteresult.go +++ b/server/events/mocks/matchers/events_preexecuteresult.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - events "github.com/hootsuite/atlantis/server/events" + events "github.com/atlantisnorth/atlantis/server/events" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/events_projectconfig.go b/server/events/mocks/matchers/events_projectconfig.go index 7461af81c7..618a5e9c71 100644 --- a/server/events/mocks/matchers/events_projectconfig.go +++ b/server/events/mocks/matchers/events_projectconfig.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - events "github.com/hootsuite/atlantis/server/events" + events "github.com/atlantisnorth/atlantis/server/events" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/models_project.go b/server/events/mocks/matchers/models_project.go index a80bb254f6..fbf125edc9 100644 --- a/server/events/mocks/matchers/models_project.go +++ b/server/events/mocks/matchers/models_project.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/models_pullrequest.go b/server/events/mocks/matchers/models_pullrequest.go index e5fc2e7949..a85e4cea02 100644 --- a/server/events/mocks/matchers/models_pullrequest.go +++ b/server/events/mocks/matchers/models_pullrequest.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/models_repo.go b/server/events/mocks/matchers/models_repo.go index ef5202dce5..a444208154 100644 --- a/server/events/mocks/matchers/models_repo.go +++ b/server/events/mocks/matchers/models_repo.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/models_user.go b/server/events/mocks/matchers/models_user.go index 38095f7b1f..c525ec5098 100644 --- a/server/events/mocks/matchers/models_user.go +++ b/server/events/mocks/matchers/models_user.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/ptr_to_events_command.go b/server/events/mocks/matchers/ptr_to_events_command.go index 132c546568..be6f6ae520 100644 --- a/server/events/mocks/matchers/ptr_to_events_command.go +++ b/server/events/mocks/matchers/ptr_to_events_command.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - events "github.com/hootsuite/atlantis/server/events" + events "github.com/atlantisnorth/atlantis/server/events" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/ptr_to_events_commandcontext.go b/server/events/mocks/matchers/ptr_to_events_commandcontext.go index 05515b00bf..93cdaf56fe 100644 --- a/server/events/mocks/matchers/ptr_to_events_commandcontext.go +++ b/server/events/mocks/matchers/ptr_to_events_commandcontext.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - events "github.com/hootsuite/atlantis/server/events" + events "github.com/atlantisnorth/atlantis/server/events" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/ptr_to_logging_simplelogger.go b/server/events/mocks/matchers/ptr_to_logging_simplelogger.go index 739f72fa09..8948899679 100644 --- a/server/events/mocks/matchers/ptr_to_logging_simplelogger.go +++ b/server/events/mocks/matchers/ptr_to_logging_simplelogger.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - logging "github.com/hootsuite/atlantis/server/logging" + logging "github.com/atlantisnorth/atlantis/server/logging" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/slice_of_models_project.go b/server/events/mocks/matchers/slice_of_models_project.go index 2cb1cac1be..ad480fabc5 100644 --- a/server/events/mocks/matchers/slice_of_models_project.go +++ b/server/events/mocks/matchers/slice_of_models_project.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/vcs_commitstatus.go b/server/events/mocks/matchers/vcs_commitstatus.go index 11ebfe2300..253d49dee6 100644 --- a/server/events/mocks/matchers/vcs_commitstatus.go +++ b/server/events/mocks/matchers/vcs_commitstatus.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - vcs "github.com/hootsuite/atlantis/server/events/vcs" + vcs "github.com/atlantisnorth/atlantis/server/events/vcs" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/matchers/vcs_host.go b/server/events/mocks/matchers/vcs_host.go index 21c080b36e..0a280e91b7 100644 --- a/server/events/mocks/matchers/vcs_host.go +++ b/server/events/mocks/matchers/vcs_host.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - vcs "github.com/hootsuite/atlantis/server/events/vcs" + vcs "github.com/atlantisnorth/atlantis/server/events/vcs" "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/mock_atlantis_workspace.go b/server/events/mocks/mock_atlantis_workspace.go index 8d79994e5e..b0ae6e09d2 100644 --- a/server/events/mocks/mock_atlantis_workspace.go +++ b/server/events/mocks/mock_atlantis_workspace.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: AtlantisWorkspace) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: AtlantisWorkspace) package mocks import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" - logging "github.com/hootsuite/atlantis/server/logging" + models "github.com/atlantisnorth/atlantis/server/events/models" + logging "github.com/atlantisnorth/atlantis/server/logging" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/mock_atlantis_workspace_locker.go b/server/events/mocks/mock_atlantis_workspace_locker.go index 4549a2b657..0d6dae5436 100644 --- a/server/events/mocks/mock_atlantis_workspace_locker.go +++ b/server/events/mocks/mock_atlantis_workspace_locker.go @@ -1,5 +1,5 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: AtlantisWorkspaceLocker) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: AtlantisWorkspaceLocker) package mocks diff --git a/server/events/mocks/mock_command_runner.go b/server/events/mocks/mock_command_runner.go index 92223daadb..1cd55c20f0 100644 --- a/server/events/mocks/mock_command_runner.go +++ b/server/events/mocks/mock_command_runner.go @@ -1,14 +1,14 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: CommandRunner) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: CommandRunner) package mocks import ( "reflect" - events "github.com/hootsuite/atlantis/server/events" - models "github.com/hootsuite/atlantis/server/events/models" - vcs "github.com/hootsuite/atlantis/server/events/vcs" + events "github.com/atlantisnorth/atlantis/server/events" + models "github.com/atlantisnorth/atlantis/server/events/models" + vcs "github.com/atlantisnorth/atlantis/server/events/vcs" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/mock_commit_status_updater.go b/server/events/mocks/mock_commit_status_updater.go index d0177f2230..194d1c4735 100644 --- a/server/events/mocks/mock_commit_status_updater.go +++ b/server/events/mocks/mock_commit_status_updater.go @@ -1,14 +1,14 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: CommitStatusUpdater) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: CommitStatusUpdater) package mocks import ( "reflect" - events "github.com/hootsuite/atlantis/server/events" - models "github.com/hootsuite/atlantis/server/events/models" - vcs "github.com/hootsuite/atlantis/server/events/vcs" + events "github.com/atlantisnorth/atlantis/server/events" + models "github.com/atlantisnorth/atlantis/server/events/models" + vcs "github.com/atlantisnorth/atlantis/server/events/vcs" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/mock_event_parsing.go b/server/events/mocks/mock_event_parsing.go index e8ddc264fe..b6e9fa5af2 100644 --- a/server/events/mocks/mock_event_parsing.go +++ b/server/events/mocks/mock_event_parsing.go @@ -1,15 +1,15 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: EventParsing) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: EventParsing) package mocks import ( "reflect" + events "github.com/atlantisnorth/atlantis/server/events" + models "github.com/atlantisnorth/atlantis/server/events/models" + vcs "github.com/atlantisnorth/atlantis/server/events/vcs" github "github.com/google/go-github/github" - events "github.com/hootsuite/atlantis/server/events" - models "github.com/hootsuite/atlantis/server/events/models" - vcs "github.com/hootsuite/atlantis/server/events/vcs" go_gitlab "github.com/lkysow/go-gitlab" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/mock_executor.go b/server/events/mocks/mock_executor.go index 140a813373..0a32ad41da 100644 --- a/server/events/mocks/mock_executor.go +++ b/server/events/mocks/mock_executor.go @@ -1,12 +1,12 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: Executor) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: Executor) package mocks import ( "reflect" - events "github.com/hootsuite/atlantis/server/events" + events "github.com/atlantisnorth/atlantis/server/events" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/mock_github_pull_getter.go b/server/events/mocks/mock_github_pull_getter.go index 43f70ff8e2..18e591a434 100644 --- a/server/events/mocks/mock_github_pull_getter.go +++ b/server/events/mocks/mock_github_pull_getter.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: GithubPullGetter) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: GithubPullGetter) package mocks import ( "reflect" + models "github.com/atlantisnorth/atlantis/server/events/models" github "github.com/google/go-github/github" - models "github.com/hootsuite/atlantis/server/events/models" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/mock_gitlab_merge_request_getter.go b/server/events/mocks/mock_gitlab_merge_request_getter.go index afdbaf14af..3b72fdc1cc 100644 --- a/server/events/mocks/mock_gitlab_merge_request_getter.go +++ b/server/events/mocks/mock_gitlab_merge_request_getter.go @@ -1,5 +1,5 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: GitlabMergeRequestGetter) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: GitlabMergeRequestGetter) package mocks diff --git a/server/events/mocks/mock_lock_url_generator.go b/server/events/mocks/mock_lock_url_generator.go index 17883a968d..5f6b2fcdae 100644 --- a/server/events/mocks/mock_lock_url_generator.go +++ b/server/events/mocks/mock_lock_url_generator.go @@ -1,5 +1,5 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: LockURLGenerator) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: LockURLGenerator) package mocks diff --git a/server/events/mocks/mock_project_config_reader.go b/server/events/mocks/mock_project_config_reader.go index e3d3f5d241..7d4ae38820 100644 --- a/server/events/mocks/mock_project_config_reader.go +++ b/server/events/mocks/mock_project_config_reader.go @@ -1,12 +1,12 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: ProjectConfigReader) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: ProjectConfigReader) package mocks import ( "reflect" - events "github.com/hootsuite/atlantis/server/events" + events "github.com/atlantisnorth/atlantis/server/events" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/mock_project_finder.go b/server/events/mocks/mock_project_finder.go index 98689778a1..d3d4bef489 100644 --- a/server/events/mocks/mock_project_finder.go +++ b/server/events/mocks/mock_project_finder.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: ProjectFinder) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: ProjectFinder) package mocks import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" - logging "github.com/hootsuite/atlantis/server/logging" + models "github.com/atlantisnorth/atlantis/server/events/models" + logging "github.com/atlantisnorth/atlantis/server/logging" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/mock_project_pre_executor.go b/server/events/mocks/mock_project_pre_executor.go index 0fe9535c0f..89b4bd93b1 100644 --- a/server/events/mocks/mock_project_pre_executor.go +++ b/server/events/mocks/mock_project_pre_executor.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: ProjectPreExecutor) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: ProjectPreExecutor) package mocks import ( "reflect" - events "github.com/hootsuite/atlantis/server/events" - models "github.com/hootsuite/atlantis/server/events/models" + events "github.com/atlantisnorth/atlantis/server/events" + models "github.com/atlantisnorth/atlantis/server/events/models" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/mocks/mock_pull_cleaner.go b/server/events/mocks/mock_pull_cleaner.go index be60deea4a..ea64aea3ab 100644 --- a/server/events/mocks/mock_pull_cleaner.go +++ b/server/events/mocks/mock_pull_cleaner.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events (interfaces: PullCleaner) +// Source: github.com/atlantisnorth/atlantis/server/events (interfaces: PullCleaner) package mocks import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" - vcs "github.com/hootsuite/atlantis/server/events/vcs" + models "github.com/atlantisnorth/atlantis/server/events/models" + vcs "github.com/atlantisnorth/atlantis/server/events/vcs" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/models/fixtures/fixtures.go b/server/events/models/fixtures/fixtures.go index dc9b96a85f..7f1c6ecefe 100644 --- a/server/events/models/fixtures/fixtures.go +++ b/server/events/models/fixtures/fixtures.go @@ -1,6 +1,6 @@ package fixtures -import "github.com/hootsuite/atlantis/server/events/models" +import "github.com/atlantisnorth/atlantis/server/events/models" var Pull = models.PullRequest{ Num: 1, @@ -11,10 +11,10 @@ var Pull = models.PullRequest{ } var Repo = models.Repo{ - CloneURL: "https://user:password@github.com/hootsuite/atlantis.git", - FullName: "hootsuite/atlantis", - Owner: "hootsuite", - SanitizedCloneURL: "https://github.com/hootsuite/atlantis.git", + CloneURL: "https://user:password@github.com/atlantisnorth/atlantis.git", + FullName: "atlantisnorth/atlantis", + Owner: "atlantisnorth", + SanitizedCloneURL: "https://github.com/atlantisnorth/atlantis.git", Name: "atlantis", } diff --git a/server/events/models/models.go b/server/events/models/models.go index c32b24be51..f79bca6c22 100644 --- a/server/events/models/models.go +++ b/server/events/models/models.go @@ -11,9 +11,9 @@ import ( // Repo is a VCS repository. type Repo struct { // FullName is the owner and repo name separated - // by a "/", ex. "hootsuite/atlantis". + // by a "/", ex. "atlantisnorth/atlantis". FullName string - // Owner is just the repo owner, ex. "hootsuite". + // Owner is just the repo owner, ex. "atlantisnorth". Owner string // Name is just the repo name, ex. "atlantis". Name string @@ -34,7 +34,7 @@ type PullRequest struct { // pull requested into the base. HeadCommit string // URL is the url of the pull request. - // ex. "https://github.com/hootsuite/atlantis/pull/1" + // ex. "https://github.com/atlantisnorth/atlantis/pull/1" URL string // Branch is the name of the head branch (not the base). Branch string @@ -79,7 +79,7 @@ type ProjectLock struct { // Terraform projects in a single repo we also include Path to the project // root relative to the repo root. type Project struct { - // RepoFullName is the owner and repo name, ex. "hootsuite/atlantis" + // RepoFullName is the owner and repo name, ex. "atlantisnorth/atlantis" RepoFullName string // Path to project root in the repo. // If "." then project is at root. diff --git a/server/events/plan_executor.go b/server/events/plan_executor.go index 89d133d4c4..d4eb0de165 100644 --- a/server/events/plan_executor.go +++ b/server/events/plan_executor.go @@ -5,11 +5,11 @@ import ( "os" "path/filepath" - "github.com/hootsuite/atlantis/server/events/locking" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/run" - "github.com/hootsuite/atlantis/server/events/terraform" - "github.com/hootsuite/atlantis/server/events/vcs" + "github.com/atlantisnorth/atlantis/server/events/locking" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/run" + "github.com/atlantisnorth/atlantis/server/events/terraform" + "github.com/atlantisnorth/atlantis/server/events/vcs" "github.com/pkg/errors" ) diff --git a/server/events/plan_executor_test.go b/server/events/plan_executor_test.go index 23f993c229..a00c5e90a3 100644 --- a/server/events/plan_executor_test.go +++ b/server/events/plan_executor_test.go @@ -4,17 +4,17 @@ import ( "errors" "testing" - "github.com/hootsuite/atlantis/server/events" - "github.com/hootsuite/atlantis/server/events/locking" - lmocks "github.com/hootsuite/atlantis/server/events/locking/mocks" - "github.com/hootsuite/atlantis/server/events/mocks" - "github.com/hootsuite/atlantis/server/events/models" - rmocks "github.com/hootsuite/atlantis/server/events/run/mocks" - tmocks "github.com/hootsuite/atlantis/server/events/terraform/mocks" - vcsmocks "github.com/hootsuite/atlantis/server/events/vcs/mocks" - "github.com/hootsuite/atlantis/server/events/vcs/mocks/matchers" - "github.com/hootsuite/atlantis/server/logging" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events" + "github.com/atlantisnorth/atlantis/server/events/locking" + lmocks "github.com/atlantisnorth/atlantis/server/events/locking/mocks" + "github.com/atlantisnorth/atlantis/server/events/mocks" + "github.com/atlantisnorth/atlantis/server/events/models" + rmocks "github.com/atlantisnorth/atlantis/server/events/run/mocks" + tmocks "github.com/atlantisnorth/atlantis/server/events/terraform/mocks" + vcsmocks "github.com/atlantisnorth/atlantis/server/events/vcs/mocks" + "github.com/atlantisnorth/atlantis/server/events/vcs/mocks/matchers" + "github.com/atlantisnorth/atlantis/server/logging" + . "github.com/atlantisnorth/atlantis/testing" . "github.com/petergtz/pegomock" ) diff --git a/server/events/project_config_test.go b/server/events/project_config_test.go index b5eb42a014..9ef350d891 100644 --- a/server/events/project_config_test.go +++ b/server/events/project_config_test.go @@ -5,8 +5,8 @@ import ( "os" "testing" - "github.com/hootsuite/atlantis/server/events" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events" + . "github.com/atlantisnorth/atlantis/testing" ) var tempConfigFile = "/tmp/" + events.ProjectConfigFile diff --git a/server/events/project_finder.go b/server/events/project_finder.go index 0560d63337..9d031a76cc 100644 --- a/server/events/project_finder.go +++ b/server/events/project_finder.go @@ -4,8 +4,8 @@ import ( "path" "strings" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/logging" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/logging" ) //go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_project_finder.go ProjectFinder diff --git a/server/events/project_finder_test.go b/server/events/project_finder_test.go index 83b3bebac0..2da8828225 100644 --- a/server/events/project_finder_test.go +++ b/server/events/project_finder_test.go @@ -3,9 +3,9 @@ package events_test import ( "testing" - "github.com/hootsuite/atlantis/server/events" - "github.com/hootsuite/atlantis/server/logging" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events" + "github.com/atlantisnorth/atlantis/server/logging" + . "github.com/atlantisnorth/atlantis/testing" ) var noopLogger = logging.NewNoopLogger() diff --git a/server/events/project_pre_execute.go b/server/events/project_pre_execute.go index c7481d4343..54f618228d 100644 --- a/server/events/project_pre_execute.go +++ b/server/events/project_pre_execute.go @@ -5,11 +5,11 @@ import ( "path/filepath" "strings" + "github.com/atlantisnorth/atlantis/server/events/locking" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/run" + "github.com/atlantisnorth/atlantis/server/events/terraform" "github.com/hashicorp/go-version" - "github.com/hootsuite/atlantis/server/events/locking" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/run" - "github.com/hootsuite/atlantis/server/events/terraform" "github.com/pkg/errors" ) diff --git a/server/events/project_pre_execute_test.go b/server/events/project_pre_execute_test.go index 9cd6b393cc..f3fe8fb9f0 100644 --- a/server/events/project_pre_execute_test.go +++ b/server/events/project_pre_execute_test.go @@ -4,16 +4,16 @@ import ( "errors" "testing" + "github.com/atlantisnorth/atlantis/server/events" + "github.com/atlantisnorth/atlantis/server/events/locking" + lmocks "github.com/atlantisnorth/atlantis/server/events/locking/mocks" + "github.com/atlantisnorth/atlantis/server/events/mocks" + "github.com/atlantisnorth/atlantis/server/events/models" + rmocks "github.com/atlantisnorth/atlantis/server/events/run/mocks" + tmocks "github.com/atlantisnorth/atlantis/server/events/terraform/mocks" + "github.com/atlantisnorth/atlantis/server/logging" + . "github.com/atlantisnorth/atlantis/testing" "github.com/hashicorp/go-version" - "github.com/hootsuite/atlantis/server/events" - "github.com/hootsuite/atlantis/server/events/locking" - lmocks "github.com/hootsuite/atlantis/server/events/locking/mocks" - "github.com/hootsuite/atlantis/server/events/mocks" - "github.com/hootsuite/atlantis/server/events/models" - rmocks "github.com/hootsuite/atlantis/server/events/run/mocks" - tmocks "github.com/hootsuite/atlantis/server/events/terraform/mocks" - "github.com/hootsuite/atlantis/server/logging" - . "github.com/hootsuite/atlantis/testing" "github.com/mohae/deepcopy" . "github.com/petergtz/pegomock" ) diff --git a/server/events/project_result.go b/server/events/project_result.go index ca5a51d085..0a0eca03dd 100644 --- a/server/events/project_result.go +++ b/server/events/project_result.go @@ -1,6 +1,6 @@ package events -import "github.com/hootsuite/atlantis/server/events/vcs" +import "github.com/atlantisnorth/atlantis/server/events/vcs" // ProjectResult is the result of executing a plan/apply for a project. type ProjectResult struct { diff --git a/server/events/pull_closed_executor.go b/server/events/pull_closed_executor.go index 7ede3a00ac..fd6156387e 100644 --- a/server/events/pull_closed_executor.go +++ b/server/events/pull_closed_executor.go @@ -7,9 +7,9 @@ import ( "strings" "text/template" - "github.com/hootsuite/atlantis/server/events/locking" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/vcs" + "github.com/atlantisnorth/atlantis/server/events/locking" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/vcs" "github.com/pkg/errors" ) diff --git a/server/events/pull_closed_executor_test.go b/server/events/pull_closed_executor_test.go index f2ae1b8deb..736088e31f 100644 --- a/server/events/pull_closed_executor_test.go +++ b/server/events/pull_closed_executor_test.go @@ -4,15 +4,15 @@ import ( "errors" "testing" - "github.com/hootsuite/atlantis/server/events" - lockmocks "github.com/hootsuite/atlantis/server/events/locking/mocks" - "github.com/hootsuite/atlantis/server/events/mocks" - "github.com/hootsuite/atlantis/server/events/mocks/matchers" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/models/fixtures" - "github.com/hootsuite/atlantis/server/events/vcs" - vcsmocks "github.com/hootsuite/atlantis/server/events/vcs/mocks" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events" + lockmocks "github.com/atlantisnorth/atlantis/server/events/locking/mocks" + "github.com/atlantisnorth/atlantis/server/events/mocks" + "github.com/atlantisnorth/atlantis/server/events/mocks/matchers" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/models/fixtures" + "github.com/atlantisnorth/atlantis/server/events/vcs" + vcsmocks "github.com/atlantisnorth/atlantis/server/events/vcs/mocks" + . "github.com/atlantisnorth/atlantis/testing" . "github.com/petergtz/pegomock" ) diff --git a/server/events/run/mocks/matchers/ptr_to_logging_simplelogger.go b/server/events/run/mocks/matchers/ptr_to_logging_simplelogger.go index 739f72fa09..8948899679 100644 --- a/server/events/run/mocks/matchers/ptr_to_logging_simplelogger.go +++ b/server/events/run/mocks/matchers/ptr_to_logging_simplelogger.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - logging "github.com/hootsuite/atlantis/server/logging" + logging "github.com/atlantisnorth/atlantis/server/logging" "github.com/petergtz/pegomock" ) diff --git a/server/events/run/mocks/mock_runner.go b/server/events/run/mocks/mock_runner.go index 9bae9461ad..406f4b96b9 100644 --- a/server/events/run/mocks/mock_runner.go +++ b/server/events/run/mocks/mock_runner.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events/run (interfaces: Runner) +// Source: github.com/atlantisnorth/atlantis/server/events/run (interfaces: Runner) package mocks import ( "reflect" + logging "github.com/atlantisnorth/atlantis/server/logging" go_version "github.com/hashicorp/go-version" - logging "github.com/hootsuite/atlantis/server/logging" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/run/run.go b/server/events/run/run.go index a2d32b734e..9df3022dec 100644 --- a/server/events/run/run.go +++ b/server/events/run/run.go @@ -10,8 +10,8 @@ import ( "os/exec" "strings" + "github.com/atlantisnorth/atlantis/server/logging" "github.com/hashicorp/go-version" - "github.com/hootsuite/atlantis/server/logging" "github.com/pkg/errors" ) diff --git a/server/events/run/run_test.go b/server/events/run/run_test.go index 114c1dfc2f..ddbe1f9fee 100644 --- a/server/events/run/run_test.go +++ b/server/events/run/run_test.go @@ -3,9 +3,9 @@ package run import ( "testing" + "github.com/atlantisnorth/atlantis/server/logging" + . "github.com/atlantisnorth/atlantis/testing" "github.com/hashicorp/go-version" - "github.com/hootsuite/atlantis/server/logging" - . "github.com/hootsuite/atlantis/testing" ) var logger = logging.NewNoopLogger() diff --git a/server/events/terraform/mocks/matchers/ptr_to_logging_simplelogger.go b/server/events/terraform/mocks/matchers/ptr_to_logging_simplelogger.go index 739f72fa09..8948899679 100644 --- a/server/events/terraform/mocks/matchers/ptr_to_logging_simplelogger.go +++ b/server/events/terraform/mocks/matchers/ptr_to_logging_simplelogger.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - logging "github.com/hootsuite/atlantis/server/logging" + logging "github.com/atlantisnorth/atlantis/server/logging" "github.com/petergtz/pegomock" ) diff --git a/server/events/terraform/mocks/mock_terraform_client.go b/server/events/terraform/mocks/mock_terraform_client.go index 0afb08cc4b..ea3c1ff839 100644 --- a/server/events/terraform/mocks/mock_terraform_client.go +++ b/server/events/terraform/mocks/mock_terraform_client.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events/terraform (interfaces: Client) +// Source: github.com/atlantisnorth/atlantis/server/events/terraform (interfaces: Client) package mocks import ( "reflect" + logging "github.com/atlantisnorth/atlantis/server/logging" go_version "github.com/hashicorp/go-version" - logging "github.com/hootsuite/atlantis/server/logging" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/terraform/terraform_client.go b/server/events/terraform/terraform_client.go index 718c2e6542..b18368c468 100644 --- a/server/events/terraform/terraform_client.go +++ b/server/events/terraform/terraform_client.go @@ -8,8 +8,8 @@ import ( "regexp" "strings" + "github.com/atlantisnorth/atlantis/server/logging" "github.com/hashicorp/go-version" - "github.com/hootsuite/atlantis/server/logging" "github.com/pkg/errors" ) diff --git a/server/events/terraform/terraform_client_test.go b/server/events/terraform/terraform_client_test.go index a481674ae4..73df89e83e 100644 --- a/server/events/terraform/terraform_client_test.go +++ b/server/events/terraform/terraform_client_test.go @@ -3,9 +3,9 @@ package terraform_test import ( "testing" + "github.com/atlantisnorth/atlantis/server/events/terraform" + . "github.com/atlantisnorth/atlantis/testing" "github.com/hashicorp/go-version" - "github.com/hootsuite/atlantis/server/events/terraform" - . "github.com/hootsuite/atlantis/testing" ) func TestMustConstraint_PancisOnBadConstraint(t *testing.T) { diff --git a/server/events/vcs/client.go b/server/events/vcs/client.go index 6e1418a36d..701105f160 100644 --- a/server/events/vcs/client.go +++ b/server/events/vcs/client.go @@ -1,7 +1,7 @@ package vcs import ( - "github.com/hootsuite/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/models" ) //go:generate pegomock generate -m --use-experimental-model-gen --package mocks -o mocks/mock_client.go Client diff --git a/server/events/vcs/github_client.go b/server/events/vcs/github_client.go index 9a02ffef43..a406d872bc 100644 --- a/server/events/vcs/github_client.go +++ b/server/events/vcs/github_client.go @@ -6,8 +6,8 @@ import ( "net/url" "strings" + "github.com/atlantisnorth/atlantis/server/events/models" "github.com/google/go-github/github" - "github.com/hootsuite/atlantis/server/events/models" "github.com/pkg/errors" ) diff --git a/server/events/vcs/gitlab_client.go b/server/events/vcs/gitlab_client.go index b603ab0eac..ebb5cd17fc 100644 --- a/server/events/vcs/gitlab_client.go +++ b/server/events/vcs/gitlab_client.go @@ -4,7 +4,7 @@ import ( "fmt" "net/url" - "github.com/hootsuite/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/models" "github.com/lkysow/go-gitlab" ) diff --git a/server/events/vcs/mocks/matchers/models_pullrequest.go b/server/events/vcs/mocks/matchers/models_pullrequest.go index e5fc2e7949..a85e4cea02 100644 --- a/server/events/vcs/mocks/matchers/models_pullrequest.go +++ b/server/events/vcs/mocks/matchers/models_pullrequest.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/vcs/mocks/matchers/models_repo.go b/server/events/vcs/mocks/matchers/models_repo.go index ef5202dce5..a444208154 100644 --- a/server/events/vcs/mocks/matchers/models_repo.go +++ b/server/events/vcs/mocks/matchers/models_repo.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" + models "github.com/atlantisnorth/atlantis/server/events/models" "github.com/petergtz/pegomock" ) diff --git a/server/events/vcs/mocks/matchers/vcs_commitstatus.go b/server/events/vcs/mocks/matchers/vcs_commitstatus.go index 11ebfe2300..253d49dee6 100644 --- a/server/events/vcs/mocks/matchers/vcs_commitstatus.go +++ b/server/events/vcs/mocks/matchers/vcs_commitstatus.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - vcs "github.com/hootsuite/atlantis/server/events/vcs" + vcs "github.com/atlantisnorth/atlantis/server/events/vcs" "github.com/petergtz/pegomock" ) diff --git a/server/events/vcs/mocks/matchers/vcs_host.go b/server/events/vcs/mocks/matchers/vcs_host.go index 21c080b36e..0a280e91b7 100644 --- a/server/events/vcs/mocks/matchers/vcs_host.go +++ b/server/events/vcs/mocks/matchers/vcs_host.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - vcs "github.com/hootsuite/atlantis/server/events/vcs" + vcs "github.com/atlantisnorth/atlantis/server/events/vcs" "github.com/petergtz/pegomock" ) diff --git a/server/events/vcs/mocks/mock_client.go b/server/events/vcs/mocks/mock_client.go index a6c70c041d..b91cc2a3a7 100644 --- a/server/events/vcs/mocks/mock_client.go +++ b/server/events/vcs/mocks/mock_client.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events/vcs (interfaces: Client) +// Source: github.com/atlantisnorth/atlantis/server/events/vcs (interfaces: Client) package mocks import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" - vcs "github.com/hootsuite/atlantis/server/events/vcs" + models "github.com/atlantisnorth/atlantis/server/events/models" + vcs "github.com/atlantisnorth/atlantis/server/events/vcs" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/vcs/mocks/mock_proxy.go b/server/events/vcs/mocks/mock_proxy.go index 145ebe32b5..b92ad82442 100644 --- a/server/events/vcs/mocks/mock_proxy.go +++ b/server/events/vcs/mocks/mock_proxy.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events/vcs (interfaces: ClientProxy) +// Source: github.com/atlantisnorth/atlantis/server/events/vcs (interfaces: ClientProxy) package mocks import ( "reflect" - models "github.com/hootsuite/atlantis/server/events/models" - vcs "github.com/hootsuite/atlantis/server/events/vcs" + models "github.com/atlantisnorth/atlantis/server/events/models" + vcs "github.com/atlantisnorth/atlantis/server/events/vcs" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/vcs/not_configured_vcs_client.go b/server/events/vcs/not_configured_vcs_client.go index e6dde48dec..b88d5e4892 100644 --- a/server/events/vcs/not_configured_vcs_client.go +++ b/server/events/vcs/not_configured_vcs_client.go @@ -3,7 +3,7 @@ package vcs import ( "fmt" - "github.com/hootsuite/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/models" ) // NotConfiguredVCSClient is used as a placeholder when Atlantis isn't configured diff --git a/server/events/vcs/proxy.go b/server/events/vcs/proxy.go index ddf6c6210b..cf39396da5 100644 --- a/server/events/vcs/proxy.go +++ b/server/events/vcs/proxy.go @@ -1,7 +1,7 @@ package vcs import ( - "github.com/hootsuite/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/models" "github.com/pkg/errors" ) diff --git a/server/events/webhooks/mocks/matchers/ptr_to_logging_simplelogger.go b/server/events/webhooks/mocks/matchers/ptr_to_logging_simplelogger.go index 739f72fa09..8948899679 100644 --- a/server/events/webhooks/mocks/matchers/ptr_to_logging_simplelogger.go +++ b/server/events/webhooks/mocks/matchers/ptr_to_logging_simplelogger.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - logging "github.com/hootsuite/atlantis/server/logging" + logging "github.com/atlantisnorth/atlantis/server/logging" "github.com/petergtz/pegomock" ) diff --git a/server/events/webhooks/mocks/matchers/webhooks_applyresult.go b/server/events/webhooks/mocks/matchers/webhooks_applyresult.go index dad2843f73..3d2d3c419a 100644 --- a/server/events/webhooks/mocks/matchers/webhooks_applyresult.go +++ b/server/events/webhooks/mocks/matchers/webhooks_applyresult.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - webhooks "github.com/hootsuite/atlantis/server/events/webhooks" + webhooks "github.com/atlantisnorth/atlantis/server/events/webhooks" "github.com/petergtz/pegomock" ) diff --git a/server/events/webhooks/mocks/mock_sender.go b/server/events/webhooks/mocks/mock_sender.go index 2270d9f20c..40fba5df91 100644 --- a/server/events/webhooks/mocks/mock_sender.go +++ b/server/events/webhooks/mocks/mock_sender.go @@ -1,13 +1,13 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events/webhooks (interfaces: Sender) +// Source: github.com/atlantisnorth/atlantis/server/events/webhooks (interfaces: Sender) package mocks import ( "reflect" - webhooks "github.com/hootsuite/atlantis/server/events/webhooks" - logging "github.com/hootsuite/atlantis/server/logging" + webhooks "github.com/atlantisnorth/atlantis/server/events/webhooks" + logging "github.com/atlantisnorth/atlantis/server/logging" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/webhooks/mocks/mock_slack_client.go b/server/events/webhooks/mocks/mock_slack_client.go index 5065908908..de2ee43032 100644 --- a/server/events/webhooks/mocks/mock_slack_client.go +++ b/server/events/webhooks/mocks/mock_slack_client.go @@ -1,12 +1,12 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events/webhooks (interfaces: SlackClient) +// Source: github.com/atlantisnorth/atlantis/server/events/webhooks (interfaces: SlackClient) package mocks import ( "reflect" - webhooks "github.com/hootsuite/atlantis/server/events/webhooks" + webhooks "github.com/atlantisnorth/atlantis/server/events/webhooks" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/events/webhooks/mocks/mock_underlying_slack_client.go b/server/events/webhooks/mocks/mock_underlying_slack_client.go index 16d07ef6e7..4f203f5c84 100644 --- a/server/events/webhooks/mocks/mock_underlying_slack_client.go +++ b/server/events/webhooks/mocks/mock_underlying_slack_client.go @@ -1,5 +1,5 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/events/webhooks (interfaces: UnderlyingSlackClient) +// Source: github.com/atlantisnorth/atlantis/server/events/webhooks (interfaces: UnderlyingSlackClient) package mocks diff --git a/server/events/webhooks/slack.go b/server/events/webhooks/slack.go index 990c939caa..37293cc9bc 100644 --- a/server/events/webhooks/slack.go +++ b/server/events/webhooks/slack.go @@ -5,7 +5,7 @@ import ( "fmt" - "github.com/hootsuite/atlantis/server/logging" + "github.com/atlantisnorth/atlantis/server/logging" "github.com/pkg/errors" ) diff --git a/server/events/webhooks/slack_client_test.go b/server/events/webhooks/slack_client_test.go index 885700de6e..265c9629ab 100644 --- a/server/events/webhooks/slack_client_test.go +++ b/server/events/webhooks/slack_client_test.go @@ -5,12 +5,12 @@ import ( "errors" "testing" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/webhooks" - "github.com/hootsuite/atlantis/server/events/webhooks/mocks" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/webhooks" + "github.com/atlantisnorth/atlantis/server/events/webhooks/mocks" "github.com/nlopes/slack" - . "github.com/hootsuite/atlantis/testing" + . "github.com/atlantisnorth/atlantis/testing" . "github.com/petergtz/pegomock" ) @@ -84,7 +84,7 @@ func TestPostMessage_Success(t *testing.T) { expParams := slack.NewPostMessageParameters() expParams.Attachments = []slack.Attachment{{ Color: "good", - Text: "Apply succeeded for ", + Text: "Apply succeeded for ", Fields: []slack.AttachmentField{ { Title: "Workspace", @@ -109,7 +109,7 @@ func TestPostMessage_Success(t *testing.T) { t.Log("When apply fails, function should succeed and indicate failure") result.Success = false expParams.Attachments[0].Color = "danger" - expParams.Attachments[0].Text = "Apply failed for " + expParams.Attachments[0].Text = "Apply failed for " err = client.PostMessage(channel, result) Ok(t, err) @@ -123,7 +123,7 @@ func TestPostMessage_Error(t *testing.T) { expParams := slack.NewPostMessageParameters() expParams.Attachments = []slack.Attachment{{ Color: "good", - Text: "Apply succeeded for ", + Text: "Apply succeeded for ", Fields: []slack.AttachmentField{ { Title: "Workspace", @@ -157,7 +157,7 @@ func setup(t *testing.T) { result = webhooks.ApplyResult{ Workspace: "production", Repo: models.Repo{ - FullName: "hootsuite/atlantis", + FullName: "atlantisnorth/atlantis", }, Pull: models.PullRequest{ Num: 1, diff --git a/server/events/webhooks/slack_test.go b/server/events/webhooks/slack_test.go index 4f2f25e8b9..fbe03cb7a8 100644 --- a/server/events/webhooks/slack_test.go +++ b/server/events/webhooks/slack_test.go @@ -4,10 +4,10 @@ import ( "regexp" "testing" - "github.com/hootsuite/atlantis/server/events/webhooks" - "github.com/hootsuite/atlantis/server/events/webhooks/mocks" - "github.com/hootsuite/atlantis/server/logging" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events/webhooks" + "github.com/atlantisnorth/atlantis/server/events/webhooks/mocks" + "github.com/atlantisnorth/atlantis/server/logging" + . "github.com/atlantisnorth/atlantis/testing" . "github.com/petergtz/pegomock" ) diff --git a/server/events/webhooks/webhooks.go b/server/events/webhooks/webhooks.go index 857b62dadf..e56d2067ec 100644 --- a/server/events/webhooks/webhooks.go +++ b/server/events/webhooks/webhooks.go @@ -6,8 +6,8 @@ import ( "errors" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/logging" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/logging" ) const SlackKind = "slack" diff --git a/server/events/webhooks/webhooks_test.go b/server/events/webhooks/webhooks_test.go index d8c233cb3c..e259da677b 100644 --- a/server/events/webhooks/webhooks_test.go +++ b/server/events/webhooks/webhooks_test.go @@ -4,10 +4,10 @@ import ( "strings" "testing" - "github.com/hootsuite/atlantis/server/events/webhooks" - "github.com/hootsuite/atlantis/server/events/webhooks/mocks" - "github.com/hootsuite/atlantis/server/logging" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server/events/webhooks" + "github.com/atlantisnorth/atlantis/server/events/webhooks/mocks" + "github.com/atlantisnorth/atlantis/server/logging" + . "github.com/atlantisnorth/atlantis/testing" . "github.com/petergtz/pegomock" ) diff --git a/server/events_controller.go b/server/events_controller.go index 00f94e23eb..b3a470c6b7 100644 --- a/server/events_controller.go +++ b/server/events_controller.go @@ -4,11 +4,11 @@ import ( "fmt" "net/http" + "github.com/atlantisnorth/atlantis/server/events" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/vcs" + "github.com/atlantisnorth/atlantis/server/logging" "github.com/google/go-github/github" - "github.com/hootsuite/atlantis/server/events" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/vcs" - "github.com/hootsuite/atlantis/server/logging" "github.com/lkysow/go-gitlab" ) diff --git a/server/events_controller_test.go b/server/events_controller_test.go index 774d414784..0e9f76d133 100644 --- a/server/events_controller_test.go +++ b/server/events_controller_test.go @@ -8,14 +8,14 @@ import ( "testing" "time" - "github.com/hootsuite/atlantis/server" - "github.com/hootsuite/atlantis/server/events" - emocks "github.com/hootsuite/atlantis/server/events/mocks" - "github.com/hootsuite/atlantis/server/events/mocks/matchers" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/events/vcs" - "github.com/hootsuite/atlantis/server/logging" - "github.com/hootsuite/atlantis/server/mocks" + "github.com/atlantisnorth/atlantis/server" + "github.com/atlantisnorth/atlantis/server/events" + emocks "github.com/atlantisnorth/atlantis/server/events/mocks" + "github.com/atlantisnorth/atlantis/server/events/mocks/matchers" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/events/vcs" + "github.com/atlantisnorth/atlantis/server/logging" + "github.com/atlantisnorth/atlantis/server/mocks" "github.com/lkysow/go-gitlab" . "github.com/petergtz/pegomock" ) diff --git a/server/github_request_validator_test.go b/server/github_request_validator_test.go index 9e2baf7d11..701b282c2f 100644 --- a/server/github_request_validator_test.go +++ b/server/github_request_validator_test.go @@ -6,8 +6,8 @@ import ( "net/url" "testing" - "github.com/hootsuite/atlantis/server" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server" + . "github.com/atlantisnorth/atlantis/testing" . "github.com/petergtz/pegomock" ) diff --git a/server/gitlab_request_parser_test.go b/server/gitlab_request_parser_test.go index 6b93d7fc61..35b69c8b5c 100644 --- a/server/gitlab_request_parser_test.go +++ b/server/gitlab_request_parser_test.go @@ -5,8 +5,8 @@ import ( "net/http" "testing" - "github.com/hootsuite/atlantis/server" - . "github.com/hootsuite/atlantis/testing" + "github.com/atlantisnorth/atlantis/server" + . "github.com/atlantisnorth/atlantis/testing" "github.com/lkysow/go-gitlab" . "github.com/petergtz/pegomock" ) diff --git a/server/logging/mocks/matchers/logging_loglevel.go b/server/logging/mocks/matchers/logging_loglevel.go index 7560428243..442c7bea30 100644 --- a/server/logging/mocks/matchers/logging_loglevel.go +++ b/server/logging/mocks/matchers/logging_loglevel.go @@ -3,7 +3,7 @@ package matchers import ( "reflect" - logging "github.com/hootsuite/atlantis/server/logging" + logging "github.com/atlantisnorth/atlantis/server/logging" "github.com/petergtz/pegomock" ) diff --git a/server/logging/mocks/mock_simple_logging.go b/server/logging/mocks/mock_simple_logging.go index c6bb99f994..abf9a179fe 100644 --- a/server/logging/mocks/mock_simple_logging.go +++ b/server/logging/mocks/mock_simple_logging.go @@ -1,5 +1,5 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server/logging (interfaces: SimpleLogging) +// Source: github.com/atlantisnorth/atlantis/server/logging (interfaces: SimpleLogging) package mocks @@ -7,7 +7,7 @@ import ( log "log" "reflect" - logging "github.com/hootsuite/atlantis/server/logging" + logging "github.com/atlantisnorth/atlantis/server/logging" pegomock "github.com/petergtz/pegomock" ) diff --git a/server/middleware.go b/server/middleware.go index 6b51c7c4be..00326f396e 100644 --- a/server/middleware.go +++ b/server/middleware.go @@ -4,7 +4,7 @@ import ( "net/http" "strings" - "github.com/hootsuite/atlantis/server/logging" + "github.com/atlantisnorth/atlantis/server/logging" "github.com/urfave/negroni" ) diff --git a/server/mocks/mock_github_request_validator.go b/server/mocks/mock_github_request_validator.go index f3c2e2dace..f7b74e8758 100644 --- a/server/mocks/mock_github_request_validator.go +++ b/server/mocks/mock_github_request_validator.go @@ -1,5 +1,5 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server (interfaces: GithubRequestValidator) +// Source: github.com/atlantisnorth/atlantis/server (interfaces: GithubRequestValidator) package mocks diff --git a/server/mocks/mock_gitlab_request_parser.go b/server/mocks/mock_gitlab_request_parser.go index 1517792f73..3fcd8304dd 100644 --- a/server/mocks/mock_gitlab_request_parser.go +++ b/server/mocks/mock_gitlab_request_parser.go @@ -1,5 +1,5 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server (interfaces: GitlabRequestParser) +// Source: github.com/atlantisnorth/atlantis/server (interfaces: GitlabRequestParser) package mocks diff --git a/server/mocks/mock_template_writer.go b/server/mocks/mock_template_writer.go index bc73c01025..cf44a25ae3 100644 --- a/server/mocks/mock_template_writer.go +++ b/server/mocks/mock_template_writer.go @@ -1,5 +1,5 @@ // Automatically generated by pegomock. DO NOT EDIT! -// Source: github.com/hootsuite/atlantis/server (interfaces: TemplateWriter) +// Source: github.com/atlantisnorth/atlantis/server (interfaces: TemplateWriter) package mocks diff --git a/server/server.go b/server/server.go index 9574474ade..8f2e33c50a 100644 --- a/server/server.go +++ b/server/server.go @@ -15,17 +15,17 @@ import ( "syscall" "time" + "github.com/atlantisnorth/atlantis/server/events" + "github.com/atlantisnorth/atlantis/server/events/locking" + "github.com/atlantisnorth/atlantis/server/events/locking/boltdb" + "github.com/atlantisnorth/atlantis/server/events/run" + "github.com/atlantisnorth/atlantis/server/events/terraform" + "github.com/atlantisnorth/atlantis/server/events/vcs" + "github.com/atlantisnorth/atlantis/server/events/webhooks" + "github.com/atlantisnorth/atlantis/server/logging" + "github.com/atlantisnorth/atlantis/server/static" "github.com/elazarl/go-bindata-assetfs" "github.com/gorilla/mux" - "github.com/hootsuite/atlantis/server/events" - "github.com/hootsuite/atlantis/server/events/locking" - "github.com/hootsuite/atlantis/server/events/locking/boltdb" - "github.com/hootsuite/atlantis/server/events/run" - "github.com/hootsuite/atlantis/server/events/terraform" - "github.com/hootsuite/atlantis/server/events/vcs" - "github.com/hootsuite/atlantis/server/events/webhooks" - "github.com/hootsuite/atlantis/server/logging" - "github.com/hootsuite/atlantis/server/static" "github.com/lkysow/go-gitlab" "github.com/pkg/errors" "github.com/urfave/cli" diff --git a/server/server_test.go b/server/server_test.go index 3fc48f0612..54752dc36b 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -10,13 +10,13 @@ import ( "testing" "time" + "github.com/atlantisnorth/atlantis/server" + "github.com/atlantisnorth/atlantis/server/events/locking/mocks" + "github.com/atlantisnorth/atlantis/server/events/models" + "github.com/atlantisnorth/atlantis/server/logging" + sMocks "github.com/atlantisnorth/atlantis/server/mocks" + . "github.com/atlantisnorth/atlantis/testing" "github.com/gorilla/mux" - "github.com/hootsuite/atlantis/server" - "github.com/hootsuite/atlantis/server/events/locking/mocks" - "github.com/hootsuite/atlantis/server/events/models" - "github.com/hootsuite/atlantis/server/logging" - sMocks "github.com/hootsuite/atlantis/server/mocks" - . "github.com/hootsuite/atlantis/testing" . "github.com/petergtz/pegomock" ) diff --git a/website/src/config.toml b/website/src/config.toml index d7f44f5182..0db35787de 100644 --- a/website/src/config.toml +++ b/website/src/config.toml @@ -7,7 +7,7 @@ Paginate = 4 [[menu.main]] name = "Docs" weight = -100 - url = "https://github.com/hootsuite/atlantis#getting-started" + url = "https://github.com/atlantisnorth/atlantis#getting-started" [[menu.main]] name = "Blog" weight = -100 @@ -15,7 +15,7 @@ Paginate = 4 [[menu.main]] name = "FAQ" weight = -100 - url = "https://github.com/hootsuite/atlantis#faq" + url = "https://github.com/atlantisnorth/atlantis#faq" [[menu.main]] name = "Demo" weight = 100 diff --git a/website/src/content/blog/atlantis-release.md b/website/src/content/blog/atlantis-release.md index d729002455..ea9ed015ea 100644 --- a/website/src/content/blog/atlantis-release.md +++ b/website/src/content/blog/atlantis-release.md @@ -7,7 +7,7 @@ draft = false toc = true +++ -We're very excited to announce the [open source](https://github.com/hootsuite/atlantis) release of Atlantis! Atlantis is a tool for collaborating on Terraform that's been in use at [Hootsuite](https://hootsuite.com) for over a year. The core functionality of Atlantis enables developers and operators to run `terraform plan` and `apply` directly from Terraform pull requests. Atlantis then comments back on the pull request with the output of the commands: +We're very excited to announce the [open source](https://github.com/atlantisnorth/atlantis) release of Atlantis! Atlantis is a tool for collaborating on Terraform that's been in use at [Hootsuite](https://hootsuite.com) for over a year. The core functionality of Atlantis enables developers and operators to run `terraform plan` and `apply` directly from Terraform pull requests. Atlantis then comments back on the pull request with the output of the commands: @@ -88,8 +88,8 @@ Since the introduction of Atlantis at Hootsuite, we've had **78** contributors t Since the introduction of Atlantis at Hootsuite we've grown to 144 Terraform repositories[^1] that manage thousands of Amazon resources. Atlantis is used for every single Terraform change throughout our organization. ## Getting started with Atlantis -If you'd like to try out Atlantis for your team you can download the latest release from https://github.com/hootsuite/atlantis/releases. If you run `atlantis bootstrap` you can get started in less than 5 minutes. -To read more about Atlantis go to https://github.com/hootsuite/atlantis. +If you'd like to try out Atlantis for your team you can download the latest release from https://github.com/atlantisnorth/atlantis/releases. If you run `atlantis bootstrap` you can get started in less than 5 minutes. +To read more about Atlantis go to https://github.com/atlantisnorth/atlantis. Check out our video for more information: {{< youtube TmIPWda0IKg >}} diff --git a/website/src/themes/kube/layouts/index.html b/website/src/themes/kube/layouts/index.html index dcf99cdc3e..f10db8e32e 100644 --- a/website/src/themes/kube/layouts/index.html +++ b/website/src/themes/kube/layouts/index.html @@ -9,8 +9,8 @@

{{.Title}}

{{.Description}}

diff --git a/website/src/themes/kube/layouts/partials/footer.html b/website/src/themes/kube/layouts/partials/footer.html index be892be965..4024d08e02 100644 --- a/website/src/themes/kube/layouts/partials/footer.html +++ b/website/src/themes/kube/layouts/partials/footer.html @@ -6,7 +6,7 @@ Blog
  • - Docs + Docs
  • FAQ diff --git a/website/src/themes/kube/layouts/partials/header.html b/website/src/themes/kube/layouts/partials/header.html index 4da86fa354..651052e414 100644 --- a/website/src/themes/kube/layouts/partials/header.html +++ b/website/src/themes/kube/layouts/partials/header.html @@ -20,7 +20,7 @@