Skip to content

Commit 51ca6ce

Browse files
samcrangchrisfarms
authored and
chrisfarms
committed
Use native Go vendoring for healthcheck app
We needed to add a dependency to the healthcheck app and Godep was proving problimatic so this switches to using `dep` for managing native vendoring, updates the Go version used to compile, upgrades any dependencies that are safe to upgrade and configures the manifest to use native vendoring by setting the GOPACKAGENAME env var.
1 parent d352f32 commit 51ca6ce

File tree

179 files changed

+35304
-1290
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

179 files changed

+35304
-1290
lines changed

concourse/pipelines/create-cloudfoundry.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1620,17 +1620,21 @@ jobs:
16201620
16211621
cp ./paas-cf/config/service-brokers/compose/catalog.json ./paas-compose-broker/
16221622
cd paas-compose-broker/
1623+
16231624
ruby -ryaml -e "
1624-
manifest = YAML.load_file('manifest.yml')
1625-
env = { 'env' => {
1625+
env = {
16261626
'LOG_LEVEL' => 'DEBUG',
16271627
'USERNAME' => 'compose-broker',
16281628
'PASSWORD' => '${COMPOSE_BROKER_PASS}',
16291629
'COMPOSE_API_KEY' => '${COMPOSE_API_KEY}',
16301630
'DB_PREFIX' => '${DB_PREFIX}',
16311631
'CLUSTER_NAME' => '${CLUSTER_NAME}',
1632-
}}
1633-
manifest['applications'].each { |app| app.merge!(env) }
1632+
}
1633+
manifest = YAML.load_file('manifest.yml')
1634+
manifest['applications'].each { |app|
1635+
app['env'] ||= app['env']
1636+
app['env'].merge!(env)
1637+
}
16341638
File.write('manifest.yml', manifest.to_yaml)
16351639
"
16361640
cf blue-green-deploy compose-broker

platform-tests/example-apps/healthcheck/Godeps/Godeps.json

Lines changed: 0 additions & 47 deletions
This file was deleted.

platform-tests/example-apps/healthcheck/Godeps/Readme

Lines changed: 0 additions & 5 deletions
This file was deleted.

platform-tests/example-apps/healthcheck/Gopkg.lock

Lines changed: 27 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
2+
# Gopkg.toml example
3+
#
4+
# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
5+
# for detailed Gopkg.toml documentation.
6+
#
7+
# required = ["github.com/user/thing/cmd/thing"]
8+
# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
9+
#
10+
# [[constraint]]
11+
# name = "github.com/user/project"
12+
# version = "1.0.0"
13+
#
14+
# [[constraint]]
15+
# name = "github.com/user/project2"
16+
# branch = "dev"
17+
# source = "github.com/myfork/project2"
18+
#
19+
# [[override]]
20+
# name = "github.com/x/y"
21+
# version = "2.4.0"
22+
23+
24+
[[constraint]]
25+
name = "github.com/go-sql-driver/mysql"
26+
version = ">=1.3.0, <=27.0.0-gbf7f34f"
27+
28+
[[constraint]]
29+
branch = "master"
30+
name = "github.com/lib/pq"
31+
32+
[[constraint]]
33+
branch = "v2"
34+
name = "gopkg.in/mgo.v2"

platform-tests/example-apps/healthcheck/manifest.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ applications:
66
instances: 2
77
command: "./bin/healthcheck"
88
buildpack: go_buildpack
9+
env:
10+
GOVERSION: go1.8
11+
GOPACKAGENAME: github.com/alphagov/paas-cf/platform-tests/example-apps/healthcheck

platform-tests/example-apps/healthcheck/vendor/github.com/go-sql-driver/mysql/.github/ISSUE_TEMPLATE.md

Lines changed: 21 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

platform-tests/example-apps/healthcheck/vendor/github.com/go-sql-driver/mysql/.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

platform-tests/example-apps/healthcheck/vendor/github.com/go-sql-driver/mysql/.gitignore

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

platform-tests/example-apps/healthcheck/vendor/github.com/go-sql-driver/mysql/.travis.yml

Lines changed: 3 additions & 79 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

platform-tests/example-apps/healthcheck/vendor/github.com/go-sql-driver/mysql/AUTHORS

Lines changed: 0 additions & 16 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)