Skip to content

Commit

Permalink
This replaces the taxi go app endpoint
Browse files Browse the repository at this point in the history 
The existing one have an issue on the go.mod definition, leading
to build failures when using the latest golang image.

This PR changes the repo to use, which have the fixes in place. This
is a fix PR, the end-goal is to tackle issue shipwright-io#366 which should avoid
problems like this in the future.
  • Loading branch information
@qu1queee
qu1queee committed Feb 17, 2021
1 parent 121b16a commit 170d8fd
Show file tree
Hide file tree
Showing 9 changed files with 30 additions and 30 deletions.
6 changes: 3 additions & 3 deletions docs/build.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ metadata:
build.build.dev/verify.repository: "false"
spec:
source:
url: https://github.com/sbose78/taxi
url: https://github.com/qu1queee/taxi
revision: master
```
Expand Down Expand Up @@ -141,7 +141,7 @@ metadata:
name: buildah-golang-build
spec:
source:
url: https://github.com/sbose78/taxi
url: https://github.com/qu1queee/taxi
revision: master
```

Expand Down Expand Up @@ -178,7 +178,7 @@ metadata:
name: buildah-golang-build
spec:
source:
url: https://github.com/sbose78/taxi
url: https://github.com/qu1queee/taxi
revision: master
strategy:
name: buildah
Expand Down
2 changes: 1 addition & 1 deletion docs/buildstrategies.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ metadata:
name: kaniko-medium
spec:
source:
url: https://github.com/sbose78/taxi
url: https://github.com/qu1queee/taxi
strategy:
name: kaniko
kind: ClusterBuildStrategy
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/build/build_controller_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,7 @@ var _ = Describe("Reconcile Build", func() {

// validate https protocol
It("fails when public source URL is unreachable", func() {
buildSample.Spec.Source.URL = "https://github.com/sbose78/taxi-fake"
buildSample.Spec.Source.URL = "https://github.com/qu1queee/taxi-fake"

statusCall := ctl.StubFunc(corev1.ConditionFalse, build.RemoteRepositoryUnreachable, "remote repository unreachable")
statusWriter.UpdateCalls(statusCall)
Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/buildrun/generate_taskrun_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ var _ = Describe("GenerateTaskrun", func() {

BeforeEach(func() {
buildpacks = "buildpacks-v3"
url = "https://github.com/sbose78/taxi"
url = "https://github.com/qu1queee/taxi"
dockerfile = "Dockerfile"
})

Expand Down
2 changes: 1 addition & 1 deletion samples/build/build_buildah_cr.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
name: buildah-golang-build
spec:
source:
url: https://github.com/sbose78/taxi
url: https://github.com/qu1queee/taxi
revision: master
strategy:
name: buildah
Expand Down
26 changes: 13 additions & 13 deletions test/build_samples.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
name: buildah
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
strategy:
name: buildah
kind: ClusterBuildStrategy
Expand All @@ -30,7 +30,7 @@ metadata:
namespace: build-test
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
strategy:
name: buildah
output:
Expand All @@ -48,7 +48,7 @@ metadata:
namespace: build-test
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
revision: master
contextDir: src
strategy:
Expand All @@ -73,7 +73,7 @@ metadata:
namespace: build-test
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
strategy:
name: buildah
output:
Expand All @@ -87,7 +87,7 @@ apiVersion: build.dev/v1alpha1
kind: Build
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
strategy:
kind: BuildStrategy
output:
Expand All @@ -101,7 +101,7 @@ apiVersion: build.dev/v1alpha1
kind: Build
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
strategy:
kind: ClusterBuildStrategy
output:
Expand All @@ -115,7 +115,7 @@ apiVersion: build.dev/v1alpha1
kind: Build
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
strategy:
kind: ClusterBuildStrategy
output:
Expand All @@ -131,7 +131,7 @@ apiVersion: build.dev/v1alpha1
kind: Build
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
strategy:
kind: ClusterBuildStrategy
output:
Expand All @@ -148,7 +148,7 @@ apiVersion: build.dev/v1alpha1
kind: Build
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
credentials:
name: source-secret
strategy:
Expand All @@ -165,7 +165,7 @@ apiVersion: build.dev/v1alpha1
kind: Build
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
builder:
image: heroku/buildpacks:18
credentials:
Expand All @@ -184,7 +184,7 @@ apiVersion: build.dev/v1alpha1
kind: Build
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
credentials:
name: source-secret
builder:
Expand All @@ -205,7 +205,7 @@ apiVersion: build.dev/v1alpha1
kind: Build
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
strategy:
kind: ClusterBuildStrategy
output:
Expand Down Expand Up @@ -265,7 +265,7 @@ metadata:
build.build.dev/build-run-deletion: "true"
spec:
source:
url: "https://github.com/sbose78/taxi"
url: "https://github.com/qu1queee/taxi"
strategy:
kind: ClusterBuildStrategy
output:
Expand Down
8 changes: 4 additions & 4 deletions test/catalog.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ func (c *Catalog) BuildWithClusterBuildStrategy(name string, ns string, strategy
},
Spec: build.BuildSpec{
Source: build.GitSource{
URL: "https://github.com/sbose78/taxi",
URL: "https://github.com/qu1queee/taxi",
},
StrategyRef: &build.StrategyRef{
Name: strategyName,
Expand All @@ -111,7 +111,7 @@ func (c *Catalog) BuildWithClusterBuildStrategyAndSourceSecret(name string, ns s
},
Spec: build.BuildSpec{
Source: build.GitSource{
URL: "https://github.com/sbose78/taxi",
URL: "https://github.com/qu1queee/taxi",
SecretRef: &corev1.LocalObjectReference{
Name: "foobar",
},
Expand All @@ -137,7 +137,7 @@ func (c *Catalog) BuildWithBuildStrategy(name string, ns string, strategyName st
},
Spec: build.BuildSpec{
Source: build.GitSource{
URL: "https://github.com/sbose78/taxi",
URL: "https://github.com/qu1queee/taxi",
},
StrategyRef: &build.StrategyRef{
Name: strategyName,
Expand All @@ -156,7 +156,7 @@ func (c *Catalog) BuildWithNilBuildStrategyKind(name string, ns string, strategy
},
Spec: build.BuildSpec{
Source: build.GitSource{
URL: "https://github.com/sbose78/taxi",
URL: "https://github.com/qu1queee/taxi",
},
StrategyRef: &build.StrategyRef{
Name: strategyName,
Expand Down
4 changes: 2 additions & 2 deletions test/integration/build_to_buildruns_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,11 +314,11 @@ var _ = Describe("Integration tests Build and BuildRuns", func() {

tr01, err := tb.GetTaskRunFromBuildRun(buildRun01.Name)
Expect(err).To(BeNil())
Expect(tr01.Spec.Resources.Inputs[0].PipelineResourceBinding.ResourceSpec.Params[0].Value).To(Equal("https://github.com/sbose78/taxi"))
Expect(tr01.Spec.Resources.Inputs[0].PipelineResourceBinding.ResourceSpec.Params[0].Value).To(Equal("https://github.com/qu1queee/taxi"))

tr02, err := tb.GetTaskRunFromBuildRun(buildRun02.Name)
Expect(err).To(BeNil())
Expect(tr02.Spec.Resources.Inputs[0].PipelineResourceBinding.ResourceSpec.Params[0].Value).To(Equal("https://github.com/sbose78/taxi"))
Expect(tr02.Spec.Resources.Inputs[0].PipelineResourceBinding.ResourceSpec.Params[0].Value).To(Equal("https://github.com/qu1queee/taxi"))

})
})
Expand Down
8 changes: 4 additions & 4 deletions test/integration/build_to_git_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ var _ = Describe("Integration tests Build and referenced Source url", func() {
Expect(err).To(BeNil())

buildObject.ObjectMeta.Annotations["build.build.dev/verify.repository"] = "true"
buildObject.Spec.Source.URL = "http://github.com/sbose78/taxi"
buildObject.Spec.Source.URL = "http://github.com/qu1queee/taxi"

Expect(tb.CreateBuild(buildObject)).To(BeNil())

Expand All @@ -71,7 +71,7 @@ var _ = Describe("Integration tests Build and referenced Source url", func() {
)
Expect(err).To(BeNil())

buildObject.Spec.Source.URL = "http://github.com/sbose78/taxi-fake"
buildObject.Spec.Source.URL = "http://github.com/qu1queee/taxi-fake"
Expect(tb.CreateBuild(buildObject)).To(BeNil())

// wait until the Build finish the validation
Expand All @@ -96,7 +96,7 @@ var _ = Describe("Integration tests Build and referenced Source url", func() {
Expect(err).To(BeNil())

buildObject.ObjectMeta.Annotations["build.build.dev/verify.repository"] = "true"
buildObject.Spec.Source.URL = "https://github.com/sbose78/taxi"
buildObject.Spec.Source.URL = "https://github.com/qu1queee/taxi"

Expect(tb.CreateBuild(buildObject)).To(BeNil())

Expand All @@ -121,7 +121,7 @@ var _ = Describe("Integration tests Build and referenced Source url", func() {
)
Expect(err).To(BeNil())

buildObject.Spec.Source.URL = "https://github.com/sbose78/taxi-fake"
buildObject.Spec.Source.URL = "https://github.com/qu1queee/taxi-fake"
Expect(tb.CreateBuild(buildObject)).To(BeNil())

// wait until the Build finish the validation
Expand Down

0 comments on commit 170d8fd

Please sign in to comment.