Skip to content

Commit fc477bd

Browse files
sklavasklava
committed
Merged in feature/SCFF-23 (pull request #5)
Feature/SCFF-23
2 parents a1eb015 + b514d80 commit fc477bd

21 files changed

Lines changed: 95 additions & 94 deletions

File tree

‎.gitignore‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Add any directories, files, or patterns you don't want to be tracked by version control
22
internal-core
3-
firehose-to-syslog*
3+
firehose-to-sumologic*
44
events/events.test
55
.project
66
*.swp

‎Godeps/Godeps.json‎

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

‎Procfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
web: firehose-to-syslog
1+
web: firehose-to-sumologic

‎caching/caching_boltdb.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (c *CachingBolt) GetAllApp() []App {
119119
}
120120

121121
for _, app := range cfApps {
122-
fmt.Printf("App [%s] Found... \n", app.Name)
122+
//fmt.Printf("App [%s] Found... \n", app.Name)
123123
apps = append(apps, App{
124124
app.Name,
125125
app.Guid,
@@ -132,7 +132,7 @@ func (c *CachingBolt) GetAllApp() []App {
132132
}
133133

134134
c.fillDatabase(apps)
135-
fmt.Printf("Found [%d] Apps!", len(apps))
135+
//fmt.Printf("Found [%d] Apps!", len(apps))
136136

137137
return apps
138138
}

‎caching/cachingfakes/fake_caching.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import (
55
"sync"
66
"time"
77

8-
"bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/caching"
8+
"bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/caching"
99
)
1010

1111
type FakeCaching struct {

‎ci/build-all/build-all‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ export ROOT_DIR=$PWD
44
export GOPATH=$PWD/gopath
55
export PATH=$GOPATH/bin:$PATH
66
export BUILD_NUMBER=`[ ${VERSION_APP} ] && cat ${VERSION_APP} || echo "0.0.0"`
7-
cd $GOPATH/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic
7+
cd $GOPATH/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic
88

99
make clean
1010
make compile
1111

12-
mv dist ${ROOT_DIR}/firehouse-to-sumologic-ci-build/
12+
mv dist ${ROOT_DIR}/firehose-to-sumologic-ci-build/

‎ci/build-all/build-all.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ image_resource:
88

99

1010
inputs:
11-
- name: firehouse-to-sumologic-ci
12-
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/
11+
- name: firehose-to-sumologic-ci
12+
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/
1313
- name: version
1414

1515
outputs:
16-
- name: firehouse-to-sumologic-ci-build
17-
16+
- name: firehose-to-sumologic-ci-build
17+
1818
run:
19-
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/ci/build-all/build-all
19+
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/ci/build-all/build-all
2020
params:
21-
VERSION_APP:
21+
VERSION_APP:

‎ci/pipeline.yml‎

Lines changed: 30 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
groups:
3-
- name: firehouse-to-sumologic
4-
jobs:
3+
- name: firehose-to-sumologic
4+
jobs:
55
- unit-testing
66
- downstream-master
77
- unit-testing-master
@@ -24,59 +24,59 @@ jobs:
2424
public: true
2525
serial: true
2626
plan:
27-
- get: firehouse-to-sumologic-ci
28-
resource: firehouse-to-sumologic-develop
27+
- get: firehose-to-sumologic-ci
28+
resource: firehose-to-sumologic-develop
2929
trigger: true
3030
- task: unit-testing
31-
file: firehouse-to-sumologic-ci/ci/unit-testing/unit-testing.yml
32-
31+
file: firehose-to-sumologic-ci/ci/unit-testing/unit-testing.yml
32+
3333

3434
- name: unit-testing-master
3535
public: true
3636
serial: true
3737
plan:
38-
- get: firehouse-to-sumologic-ci
39-
resource: firehouse-to-sumologic-master
38+
- get: firehose-to-sumologic-ci
39+
resource: firehose-to-sumologic-master
4040
trigger: true
4141
- task: unit-testing
42-
file: firehouse-to-sumologic-ci/ci/unit-testing/unit-testing.yml
42+
file: firehose-to-sumologic-ci/ci/unit-testing/unit-testing.yml
4343

4444

4545
- name: tag-master
4646
public: true
4747
serial: true
48-
plan:
49-
- get: firehouse-to-sumologic-ci
50-
resource: firehouse-to-sumologic-master
48+
plan:
49+
- get: firehose-to-sumologic-ci
50+
resource: firehose-to-sumologic-master
5151
passed: [unit-testing-master]
5252
- put: version
5353
params: {bump: minor}
54-
- put: firehouse-to-sumologic-master
55-
params:
54+
- put: firehose-to-sumologic-master
55+
params:
5656
only_tag: true
57-
repository: firehouse-to-sumologic-ci
57+
repository: firehose-to-sumologic-ci
5858
tag: version/number
5959

6060

6161
- name: ship-it
6262
public: true
6363
serial: true
6464
plan:
65-
- get: firehouse-to-sumologic-ci
66-
resource: firehouse-to-sumologic-master
65+
- get: firehose-to-sumologic-ci
66+
resource: firehose-to-sumologic-master
6767
passed: [tag-master]
6868
trigger: true
6969
- get: version
7070
- task: build-binary
71-
file: firehouse-to-sumologic-ci/ci/build-all/build-all.yml
71+
file: firehose-to-sumologic-ci/ci/build-all/build-all.yml
7272
params:
7373
VERSION_APP: version/number
7474
- put: gh-release
7575
params :
7676
name: version/number
7777
tag: version/number
7878
globs:
79-
- firehouse-to-sumologic-ci-build/dist/*/*/*
79+
- firehose-to-sumologic-ci-build/dist/*/*/*
8080

8181

8282

@@ -86,16 +86,16 @@ jobs:
8686
serial: true
8787
plan:
8888
- aggregate:
89-
- get: firehouse-to-sumologic-ci
90-
resource: firehouse-to-sumologic-develop
89+
- get: firehose-to-sumologic-ci
90+
resource: firehose-to-sumologic-develop
9191
- get: release-repo-master
92-
resource: firehouse-to-sumologic-master
92+
resource: firehouse-to-sumologic-master
9393
trigger: true
9494
passed: [tag-master]
9595
- get: release-repo
96-
resource: firehouse-to-sumologic-merge-target
96+
resource: firehose-to-sumologic-merge-target
9797
- task: merge-master-to-develop
98-
file: firehouse-to-sumologic-ci/ci/merge-master-to-develop/merge-master-to-develop.yml
98+
file: firehose-to-sumologic-ci/ci/merge-master-to-develop/merge-master-to-develop.yml
9999
params:
100100
GIT_USERNAME: {{github-username}}
101101
GIT_EMAIL: {{github-email}}
@@ -104,17 +104,17 @@ jobs:
104104

105105

106106
resources:
107-
- name: firehouse-to-sumologic-merge-target
107+
- name: firehose-to-sumologic-merge-target
108108
type: git
109109
source:
110110
branch: develop
111111
private_key: {{private-key-github-concourse}}
112-
uri: git@github.com:cloudfoundry-community/firehouse-to-sumologic.git
112+
uri: git@github.com:cloudfoundry-community/firehose-to-sumologic.git
113113

114-
- name: firehouse-to-sumologic-develop
114+
- name: firehose-to-sumologic-develop
115115
type: git
116116
source:
117-
uri: git@github.com:cloudfoundry-community/firehouse-to-sumologic.git
117+
uri: git@github.com:cloudfoundry-community/firehose-to-sumologic.git
118118
branch: develop
119119
private_key: {{private-key-github-concourse}}
120120

@@ -131,14 +131,14 @@ resources:
131131
type: github-release
132132
source:
133133
user: cloudfoundry-community
134-
repository: firehouse-to-sumologic
134+
repository: firehose-to-sumologic
135135
access_token: {{github-access-token}}
136136

137137
- name: version
138138
type: semver-gwenn
139139
source:
140140
driver: git
141-
uri: git@github.com:cloudfoundry-community/firehouse-to-sumologic.git
141+
uri: git@github.com:cloudfoundry-community/firehose-to-sumologic.git
142142
branch: version
143143
file: version
144144
private_key: {{private-key-github-concourse}}
@@ -151,5 +151,3 @@ resource_types:
151151
type: docker-image
152152
source:
153153
repository: getourneau/semver-resource
154-
155-

‎ci/unit-testing/unit-testing‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ export PATH=$GOPATH/bin:$PATH
88
go get github.com/onsi/ginkgo/ginkgo
99
go get github.com/onsi/gomega
1010

11-
cd $GOPATH/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/
11+
cd $GOPATH/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/
1212

1313

14-
make test
14+
make test

‎ci/unit-testing/unit-testing.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ image_resource:
88

99
inputs:
1010
- name: firehouse-to-sumologic-ci
11-
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/
12-
13-
run:
14-
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehouse-to-sumologic/ci/unit-testing/unit-testing
11+
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/
1512

13+
run:
14+
path: gopath/src/bitbucket.org/mcplusa-ondemand/firehose-to-sumologic/ci/unit-testing/unit-testing

0 commit comments

Comments
 (0)