Skip to content

Commit

Permalink
remove d.ims.io references. Move gitlab references to github
Browse files Browse the repository at this point in the history
  • Loading branch information
zpatrick committed Dec 6, 2016
1 parent 44057c0 commit 793b528
Show file tree
Hide file tree
Showing 204 changed files with 580 additions and 580 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ RUN apt-get update && apt-get install -y \
RUN curl -sSL https://get.docker.com/ | sed 's/docker-engine/docker-engine=1.9.1-0~jessie/' | sh
RUN pip install awscli

ENV APP gitlab.imshealth.com/xfra/layer0
ENV APP github.com/quintilesims/layer0
RUN mkdir -p /go/src/$APP
WORKDIR /go/src/$APP
ENTRYPOINT [ "./scripts/entrypoint.sh" ]
Expand Down
22 changes: 11 additions & 11 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ The basic branching workflow is:
## Pre-release Checklist
Before starting the release process, make sure to check the following items:

* Have all the necessary [merge requests](https://gitlab.imshealth.com/xfra/layer0/merge_requests) been merged?
* Does a [release](https://gitlab.imshealth.com/xfra/layer0/branches) branch already exist? It should have been removed after the last release.
* Do you have the [layer0](https://gitlab.imshealth.com/xfra/layer0) repository cloned locally with a remote named `xfra`? If not, run:
* Have all the necessary [merge requests](https://github.com/quintilesims/layer0/merge_requests) been merged?
* Does a [release](https://github.com/quintilesims/layer0/branches) branch already exist? It should have been removed after the last release.
* Do you have the [layer0](https://github.com/quintilesims/layer0) repository cloned locally with a remote named `xfra`? If not, run:
```
git remote add xfra ssh://[email protected]:2222/xfra/layer0.git
```
Expand All @@ -38,22 +38,22 @@ git push -u xfra release
```

## Add Release Notes
Update [RELEASE_NOTES.md](https://gitlab.imshealth.com/xfra/layer0/blob/release/RELEASE_NOTES.md) with information about the current release.
This can either be done locally or through the [Gitlab UI](https://gitlab.imshealth.com/xfra/layer0/edit/release/RELEASE_NOTES.md).
Update [RELEASE_NOTES.md](https://github.com/quintilesims/layer0/blob/release/RELEASE_NOTES.md) with information about the current release.
This can either be done locally or through the [Gitlab UI](https://github.com/quintilesims/layer0/edit/release/RELEASE_NOTES.md).
Please follow the existing formatting when adding release notes.
Commit your changes and push them to the `release` branch when you are done.

## Update Documentation
There are a couple of references in the [docs](https://gitlab.imshealth.com/xfra/layer0/tree/release/docs/docs) section that will need to be updated with the latest version:
There are a couple of references in the [docs](https://github.com/quintilesims/layer0/tree/release/docs/docs) section that will need to be updated with the latest version:

* [mkdocs.yml](https://gitlab.imshealth.com/xfra/layer0/blob/release/docs/mkdocs.yml#L40)
* [index.md](https://gitlab.imshealth.com/xfra/layer0/blob/release/docs/docs/index.md)
* [releases.md](https://gitlab.imshealth.com/xfra/layer0/blob/release/docs/docs/releases.md)
* [mkdocs.yml](https://github.com/quintilesims/layer0/blob/release/docs/mkdocs.yml#L40)
* [index.md](https://github.com/quintilesims/layer0/blob/release/docs/docs/index.md)
* [releases.md](https://github.com/quintilesims/layer0/blob/release/docs/docs/releases.md)

Commit your changes and push them to the release branch when you are done.

## Merge Release into Master
With the release notes and documentation updated, [create a merge request](https://gitlab.imshealth.com/xfra/layer0/merge_requests/new#) from the `release` branch targeting the `master` branch.
With the release notes and documentation updated, [create a merge request](https://github.com/quintilesims/layer0/merge_requests/new#) from the `release` branch targeting the `master` branch.
Wait for the unit tests and smoketests to pass before merging.
Once the merge request has finished, make sure to delete the `release` branch.

Expand Down Expand Up @@ -88,4 +88,4 @@ summary of the release contents. For example:
```

# Merge Master into Develop
To bring the `develop` branch up-to-date with `master`, create a [create a merge request](https://gitlab.imshealth.com/xfra/layer0/merge_requests/new#) from the `master` branch targeting the `develop` branch.
To bring the `develop` branch up-to-date with `master`, create a [create a merge request](https://github.com/quintilesims/layer0/merge_requests/new#) from the `master` branch targeting the `develop` branch.
36 changes: 18 additions & 18 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ The deploy apply command still exists, but will be depreciated in further releas

---
## v0.6.3
5.3.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.6.3)
5.3.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.6.3)

#### Features
* Add tags for API Environment, LoadBalancer, and Service
Expand All @@ -136,7 +136,7 @@ The deploy apply command still exists, but will be depreciated in further releas

---
## v0.6.2
4.15.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.6.2)
4.15.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.6.2)

*Updating your Layer0 API from previous versions will cause your endpoint URL to change.
Please review the [update instructions](http://docs.xfra.ims.io/setup/update/#migration-from-v060-or-v061-to-v062) for more information.*
Expand All @@ -155,15 +155,15 @@ Please review the [update instructions](http://docs.xfra.ims.io/setup/update/#mi

---
## v0.6.1
4.4.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.6.1)
4.4.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.6.1)

#### Features

* 1-Off Tasks are now available in the API and CLI. For more information on usage consult the documentation on [docs.xfra.ims.io](http://docs.xfra.ims.io/reference/cli/#tasks)

---
## v0.6.0
3.24.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.6.0)
3.24.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.6.0)

*This release is incompatible with previous versions of Layer0.
Please see our [update documentation](http://docs.xfra.ims.io/setup/update/) for more information.*
Expand All @@ -179,29 +179,29 @@ Please see the [Consul Reference](http://docs.xfra.ims.io/reference/consul/) for

---
## v0.6.0-rc.2
3.8.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.6.0-rc.2)
3.8.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.6.0-rc.2)

#### Features
* This is a release candidate for v0.6.0

---
## v0.6.0-rc.1
3.1.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.6.0-rc.1)
3.1.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.6.0-rc.1)

#### Features
* This is a release candidate for v0.6.0

---
## v0.5.5
2.24.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.5.5)
2.24.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.5.5)

#### Bug Fixes
* Fix consul-agent bootstrapping
* Resolve permissions issue with beanstalk deployment files and S3

---
## v0.5.4
1.26.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.5.4)
1.26.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.5.4)

#### Features
* Add documentation for Loadbalancers
Expand All @@ -212,7 +212,7 @@ Please see the [Consul Reference](http://docs.xfra.ims.io/reference/consul/) for

---
## v0.5.3
1.25.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.5.3)
1.25.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.5.3)

#### Features
* Setup locks down API docker image version instead of always using `"l0-api:master"`
Expand All @@ -225,21 +225,21 @@ Please see the [Consul Reference](http://docs.xfra.ims.io/reference/consul/) for

---
## v0.5.2
1.15.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.5.2)
1.15.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.5.2)

#### Bug Fixes
* CLI `loadbalancer:update` command now has correct url path

---
## v0.5.1
1.14.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.5.1)
1.14.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.5.1)

#### Bug Fixes
* Setup now sets `iam:PassRole` permission correctly

---
## v0.5.0
1.13.2016 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.5.0)
1.13.2016 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.5.0)

#### Feautures
* Loadbalancers as a first-class entity. Please see [Usage](https://gitlab.imshealth.com/xfra/l0-cli/tree/master#create-a-load-balancer) for more information
Expand All @@ -255,11 +255,11 @@ users no longer have to manually use the `admin/sql` endpoint in swagger.
# Layer0 v0.5 is now available!
---
## v0.4.2
12.8.2015 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.4.2)
12.8.2015 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.4.2)

#### Feautures
* Layer0 can be installed into an existing VPC.
Please see [Usage](https://gitlab.imshealth.com/xfra/layer0/tree/master/setup#install-into-an-existing-vpc) for more information
Please see [Usage](https://github.com/quintilesims/layer0/tree/master/setup#install-into-an-existing-vpc) for more information
* Random authentication token generation for API
* Expanded CLI usage/help information

Expand All @@ -271,10 +271,10 @@ Please see [Usage](https://gitlab.imshealth.com/xfra/layer0/tree/master/setup#in

---
## v0.4.1
11.18.2015 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.4.1)
11.18.2015 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.4.1)

#### Feautures
* Custom authentication option for API. Please see [Usage](https://gitlab.imshealth.com/xfra/layer0/tree/master/setup#custom-authentication) for more information
* Custom authentication option for API. Please see [Usage](https://github.com/quintilesims/layer0/tree/master/setup#custom-authentication) for more information
* Updated Setup now uses `Terraform` for all infrastructure management
* Improved error messages in CLI
* CLI only shows the latest version of each deploy with `deploy` and `deploy:get` commands
Expand All @@ -286,9 +286,9 @@ Please see [Usage](https://gitlab.imshealth.com/xfra/layer0/tree/master/setup#in

---
## v0.4.0
1.14.2015 | [Download](https://gitlab.imshealth.com/xfra/layer0-release/tree/master/v0.4.0)
1.14.2015 | [Download](https://github.com/quintilesims/layer0-release/tree/master/v0.4.0)

*This release has changed some of the versions previously released to be more compliant with http://semver.org. For more information please read [Reversioning](https://gitlab.imshealth.com/xfra/layer0-release/blob/master/REVERSIONING.md).*
*This release has changed some of the versions previously released to be more compliant with http://semver.org. For more information please read [Reversioning](https://github.com/quintilesims/layer0-release/blob/master/REVERSIONING.md).*

#### Feautures
* Tagging for Layer0 entities. Please see [Usage](https://gitlab.imshealth.com/xfra/l0-cli/tree/master#aside-fuzzy-match) for more information
Expand Down
2 changes: 1 addition & 1 deletion api/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
L0_VERSION?=$(shell git describe --tags)
API_DOCKER_IMAGE=d.ims.io/xfra/l0-api:$(L0_VERSION)
API_DOCKER_IMAGE=quintilesims/l0-api:$(L0_VERSION)

build:
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -a --ldflags "-X main.Version=$(L0_VERSION)" --tags scratch -o l0-api .
Expand Down
16 changes: 8 additions & 8 deletions api/backend/ecs/backend.go
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ecsbackend

import (
"gitlab.imshealth.com/xfra/layer0/api/data"
"gitlab.imshealth.com/xfra/layer0/common/aws/autoscaling"
"gitlab.imshealth.com/xfra/layer0/common/aws/cloudwatchlogs"
"gitlab.imshealth.com/xfra/layer0/common/aws/ec2"
"gitlab.imshealth.com/xfra/layer0/common/aws/ecs"
"gitlab.imshealth.com/xfra/layer0/common/aws/elb"
"gitlab.imshealth.com/xfra/layer0/common/aws/iam"
"gitlab.imshealth.com/xfra/layer0/common/aws/s3"
"github.com/quintilesims/layer0/api/data"
"github.com/quintilesims/layer0/common/aws/autoscaling"
"github.com/quintilesims/layer0/common/aws/cloudwatchlogs"
"github.com/quintilesims/layer0/common/aws/ec2"
"github.com/quintilesims/layer0/common/aws/ecs"
"github.com/quintilesims/layer0/common/aws/elb"
"github.com/quintilesims/layer0/common/aws/iam"
"github.com/quintilesims/layer0/common/aws/s3"
)

// todo: this is an awkward design pattern - we don't need to split the ECSBackend
Expand Down
10 changes: 5 additions & 5 deletions api/backend/ecs/certificate_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ package ecsbackend

import (
"fmt"
"gitlab.imshealth.com/xfra/layer0/api/backend/ecs/id"
"gitlab.imshealth.com/xfra/layer0/common/aws/iam"
"gitlab.imshealth.com/xfra/layer0/common/config"
"gitlab.imshealth.com/xfra/layer0/common/errors"
"gitlab.imshealth.com/xfra/layer0/common/models"
"github.com/quintilesims/layer0/api/backend/ecs/id"
"github.com/quintilesims/layer0/common/aws/iam"
"github.com/quintilesims/layer0/common/config"
"github.com/quintilesims/layer0/common/errors"
"github.com/quintilesims/layer0/common/models"
"strings"
)

Expand Down
8 changes: 4 additions & 4 deletions api/backend/ecs/certificate_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package ecsbackend
import (
"fmt"
"github.com/golang/mock/gomock"
"gitlab.imshealth.com/xfra/layer0/api/backend/ecs/id"
"gitlab.imshealth.com/xfra/layer0/common/aws/iam"
"gitlab.imshealth.com/xfra/layer0/common/aws/iam/mock_iam"
"gitlab.imshealth.com/xfra/layer0/common/testutils"
"github.com/quintilesims/layer0/api/backend/ecs/id"
"github.com/quintilesims/layer0/common/aws/iam"
"github.com/quintilesims/layer0/common/aws/iam/mock_iam"
"github.com/quintilesims/layer0/common/testutils"
"testing"
)

Expand Down
8 changes: 4 additions & 4 deletions api/backend/ecs/cluster_scaler.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ package ecsbackend

import (
log "github.com/Sirupsen/logrus"
"gitlab.imshealth.com/xfra/layer0/api/backend"
"gitlab.imshealth.com/xfra/layer0/api/backend/ecs/id"
"gitlab.imshealth.com/xfra/layer0/common/aws/autoscaling"
"gitlab.imshealth.com/xfra/layer0/common/aws/ecs"
"github.com/quintilesims/layer0/api/backend"
"github.com/quintilesims/layer0/api/backend/ecs/id"
"github.com/quintilesims/layer0/common/aws/autoscaling"
"github.com/quintilesims/layer0/common/aws/ecs"
"strconv"
)

Expand Down
8 changes: 4 additions & 4 deletions api/backend/ecs/deploy_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package ecsbackend
import (
"encoding/json"
"fmt"
"gitlab.imshealth.com/xfra/layer0/api/backend/ecs/id"
"gitlab.imshealth.com/xfra/layer0/common/aws/ecs"
"gitlab.imshealth.com/xfra/layer0/common/errors"
"gitlab.imshealth.com/xfra/layer0/common/models"
"github.com/quintilesims/layer0/api/backend/ecs/id"
"github.com/quintilesims/layer0/common/aws/ecs"
"github.com/quintilesims/layer0/common/errors"
"github.com/quintilesims/layer0/common/models"
"strings"
)

Expand Down
14 changes: 7 additions & 7 deletions api/backend/ecs/deploy_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import (
"fmt"
aws_ecs "github.com/aws/aws-sdk-go/service/ecs"
"github.com/golang/mock/gomock"
"gitlab.imshealth.com/xfra/layer0/api/backend/ecs/id"
"gitlab.imshealth.com/xfra/layer0/api/backend/ecs/mock_ecsbackend"
"gitlab.imshealth.com/xfra/layer0/common/aws/ecs"
"gitlab.imshealth.com/xfra/layer0/common/aws/ecs/mock_ecs"
"gitlab.imshealth.com/xfra/layer0/common/models"
"gitlab.imshealth.com/xfra/layer0/common/testutils"
"github.com/quintilesims/layer0/api/backend/ecs/id"
"github.com/quintilesims/layer0/api/backend/ecs/mock_ecsbackend"
"github.com/quintilesims/layer0/common/aws/ecs"
"github.com/quintilesims/layer0/common/aws/ecs/mock_ecs"
"github.com/quintilesims/layer0/common/models"
"github.com/quintilesims/layer0/common/testutils"
"testing"
)

Expand Down Expand Up @@ -238,7 +238,7 @@ func TestCreateDeploy(t *testing.T) {
"ContainerDefinitions": [
{
"name": "test",
"image": "d.ims.io/xfra/test",
"image": "quintilesims/test",
"essential": true,
"memory": 128
}
Expand Down
2 changes: 1 addition & 1 deletion api/backend/ecs/ecs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package ecsbackend

import (
log "github.com/Sirupsen/logrus"
"gitlab.imshealth.com/xfra/layer0/common/config"
"github.com/quintilesims/layer0/common/config"
"os"
"testing"
)
Expand Down
18 changes: 9 additions & 9 deletions api/backend/ecs/environment_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ import (
"time"

log "github.com/Sirupsen/logrus"
"gitlab.imshealth.com/xfra/layer0/api/backend"
"gitlab.imshealth.com/xfra/layer0/api/backend/ecs/id"
"gitlab.imshealth.com/xfra/layer0/common/aws/autoscaling"
"gitlab.imshealth.com/xfra/layer0/common/aws/ec2"
"gitlab.imshealth.com/xfra/layer0/common/aws/ecs"
"gitlab.imshealth.com/xfra/layer0/common/config"
"gitlab.imshealth.com/xfra/layer0/common/errors"
"gitlab.imshealth.com/xfra/layer0/common/models"
"gitlab.imshealth.com/xfra/layer0/common/waitutils"
"github.com/quintilesims/layer0/api/backend"
"github.com/quintilesims/layer0/api/backend/ecs/id"
"github.com/quintilesims/layer0/common/aws/autoscaling"
"github.com/quintilesims/layer0/common/aws/ec2"
"github.com/quintilesims/layer0/common/aws/ecs"
"github.com/quintilesims/layer0/common/config"
"github.com/quintilesims/layer0/common/errors"
"github.com/quintilesims/layer0/common/models"
"github.com/quintilesims/layer0/common/waitutils"
)

type ECSEnvironmentManager struct {
Expand Down
22 changes: 11 additions & 11 deletions api/backend/ecs/environment_manager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@ import (
"fmt"
"github.com/aws/aws-sdk-go/aws/awserr"
"github.com/golang/mock/gomock"
"gitlab.imshealth.com/xfra/layer0/api/backend/ecs/id"
"gitlab.imshealth.com/xfra/layer0/api/backend/mock_backend"
"gitlab.imshealth.com/xfra/layer0/common/aws/autoscaling"
"gitlab.imshealth.com/xfra/layer0/common/aws/autoscaling/mock_autoscaling"
"gitlab.imshealth.com/xfra/layer0/common/aws/ec2"
"gitlab.imshealth.com/xfra/layer0/common/aws/ec2/mock_ec2"
"gitlab.imshealth.com/xfra/layer0/common/aws/ecs"
"gitlab.imshealth.com/xfra/layer0/common/aws/ecs/mock_ecs"
"gitlab.imshealth.com/xfra/layer0/common/config"
"gitlab.imshealth.com/xfra/layer0/common/models"
"gitlab.imshealth.com/xfra/layer0/common/testutils"
"github.com/quintilesims/layer0/api/backend/ecs/id"
"github.com/quintilesims/layer0/api/backend/mock_backend"
"github.com/quintilesims/layer0/common/aws/autoscaling"
"github.com/quintilesims/layer0/common/aws/autoscaling/mock_autoscaling"
"github.com/quintilesims/layer0/common/aws/ec2"
"github.com/quintilesims/layer0/common/aws/ec2/mock_ec2"
"github.com/quintilesims/layer0/common/aws/ecs"
"github.com/quintilesims/layer0/common/aws/ecs/mock_ecs"
"github.com/quintilesims/layer0/common/config"
"github.com/quintilesims/layer0/common/models"
"github.com/quintilesims/layer0/common/testutils"
"testing"
)

Expand Down
2 changes: 1 addition & 1 deletion api/backend/ecs/id/id.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package id
import (
"crypto/md5"
"fmt"
"gitlab.imshealth.com/xfra/layer0/common/config"
"github.com/quintilesims/layer0/common/config"
"regexp"
"strings"
"time"
Expand Down
Loading

0 comments on commit 793b528

Please sign in to comment.