diff --git a/internal/commands/find_release_version_test.go b/internal/commands/find_release_version_test.go index 4a7ae4198..9ef7004fa 100644 --- a/internal/commands/find_release_version_test.go +++ b/internal/commands/find_release_version_test.go @@ -84,9 +84,9 @@ releases: releaseName = "uaac" fakeReleasesSource.FindReleaseVersionReturns(component.Lock{ Name: releaseName, Version: "74.12.5", - RemotePath: "remote_url", - RemoteSource: "bosh.io", - SHA1: "some-sha", + RemotePath: "remote_url", + RemoteSource: "bosh.io", + SHA1: "some-sha", }, true, nil) }) @@ -112,8 +112,8 @@ releases: releaseName = "uaa" fakeReleasesSource.FindReleaseVersionReturns(component.Lock{ Name: releaseName, Version: "74.16.5", - RemotePath: "remote_url", - RemoteSource: "sourceId", + RemotePath: "remote_url", + RemoteSource: "sourceId", }, true, nil) }) diff --git a/internal/commands/update_release_test.go b/internal/commands/update_release_test.go index c40e69a08..fee54394e 100644 --- a/internal/commands/update_release_test.go +++ b/internal/commands/update_release_test.go @@ -68,16 +68,16 @@ var _ = Describe("UpdateRelease", func() { kilnfileLock = cargo.KilnfileLock{ Releases: []cargo.ComponentLock{ { - Name: "minecraft", - Version: "2.0.1", + Name: "minecraft", + Version: "2.0.1", SHA1: "developersdevelopersdevelopersdevelopers", RemoteSource: "bosh.io", RemotePath: "not-used", }, { - Name: releaseName, - Version: oldReleaseVersion, + Name: releaseName, + Version: oldReleaseVersion, SHA1: oldReleaseSha1, RemoteSource: oldReleaseSourceName, @@ -100,13 +100,13 @@ var _ = Describe("UpdateRelease", func() { downloadedReleasePath = filepath.Join(releasesDir, fmt.Sprintf("%s-%s.tgz", releaseName, newReleaseVersion)) expectedDownloadedRelease = component.Local{ - Lock: component.Lock{Name: releaseName, Version: newReleaseVersion, SHA1: newReleaseSha1}, + Lock: component.Lock{Name: releaseName, Version: newReleaseVersion, SHA1: newReleaseSha1}, LocalPath: downloadedReleasePath, } expectedRemoteRelease = expectedDownloadedRelease.Lock.WithRemote(newReleaseSourceName, newRemotePath) exepectedNotDownloadedRelease := component.Lock{ - Name: releaseName, - Version: notDownloadedReleaseVersion, + Name: releaseName, + Version: notDownloadedReleaseVersion, RemotePath: notDownloadedRemotePath, RemoteSource: notDownloadedReleaseSourceName, SHA1: notDownloadedReleaseSha1, @@ -163,8 +163,8 @@ var _ = Describe("UpdateRelease", func() { Expect(updatedLockfile.Releases).To(HaveLen(2)) Expect(updatedLockfile.Releases).To(ContainElement( cargo.ComponentLock{ - Name: releaseName, - Version: newReleaseVersion, + Name: releaseName, + Version: newReleaseVersion, SHA1: newReleaseSha1, RemoteSource: newReleaseSourceName, @@ -217,13 +217,13 @@ var _ = Describe("UpdateRelease", func() { BeforeEach(func() { expectedDownloadedRelease = component.Local{ - Lock: component.Lock{Name: releaseName, Version: oldReleaseVersion, SHA1: oldReleaseSha1}, + Lock: component.Lock{Name: releaseName, Version: oldReleaseVersion, SHA1: oldReleaseSha1}, LocalPath: "not-used", } expectedRemoteRelease = component.Lock{ Name: releaseName, Version: oldReleaseVersion, - RemotePath: oldRemotePath, - RemoteSource: oldReleaseSourceName, + RemotePath: oldRemotePath, + RemoteSource: oldReleaseSourceName, } releaseSource.GetMatchedReleaseReturns(expectedRemoteRelease, true, nil) @@ -381,8 +381,8 @@ var _ = Describe("UpdateRelease", func() { Expect(updatedLockfile.Releases).To(HaveLen(2)) Expect(updatedLockfile.Releases).To(ContainElement( cargo.ComponentLock{ - Name: releaseName, - Version: notDownloadedReleaseVersion, + Name: releaseName, + Version: notDownloadedReleaseVersion, SHA1: notDownloadedReleaseSha1, RemoteSource: notDownloadedReleaseSourceName, RemotePath: notDownloadedRemotePath, diff --git a/internal/commands/update_stemcell_test.go b/internal/commands/update_stemcell_test.go index d9fb06826..72cf5b05d 100644 --- a/internal/commands/update_stemcell_test.go +++ b/internal/commands/update_stemcell_test.go @@ -69,15 +69,15 @@ var _ = Describe("UpdateStemcell", func() { kilnfileLock = cargo.KilnfileLock{ Releases: []cargo.ComponentLock{ { - Name: release1Name, - Version: release1Version, + Name: release1Name, + Version: release1Version, SHA1: "old-sha-1", RemoteSource: "old-remote-source-1", RemotePath: "old-remote-path-1", }, { - Name: release2Name, - Version: release2Version, + Name: release2Name, + Version: release2Version, SHA1: "old-sha-2", RemoteSource: "old-remote-source-2", RemotePath: "old-remote-path-2", @@ -95,15 +95,15 @@ var _ = Describe("UpdateStemcell", func() { case release1Name: remote := component.Lock{ Name: release1Name, Version: release1Version, - RemotePath: newRelease1RemotePath, - RemoteSource: publishableReleaseSourceID, + RemotePath: newRelease1RemotePath, + RemoteSource: publishableReleaseSourceID, } return remote, true, nil case release2Name: remote := component.Lock{ Name: release2Name, Version: release2Version, - RemotePath: newRelease2RemotePath, - RemoteSource: unpublishableReleaseSourceID, + RemotePath: newRelease2RemotePath, + RemoteSource: unpublishableReleaseSourceID, } return remote, true, nil default: @@ -115,13 +115,13 @@ var _ = Describe("UpdateStemcell", func() { switch remote.Name { case release1Name: local := component.Local{ - Lock: component.Lock{Name: release1Name, Version: release1Version, SHA1: newRelease1SHA}, + Lock: component.Lock{Name: release1Name, Version: release1Version, SHA1: newRelease1SHA}, LocalPath: "not-used", } return local, nil case release2Name: local := component.Local{ - Lock: component.Lock{Name: release2Name, Version: release2Version, SHA1: newRelease2SHA}, + Lock: component.Lock{Name: release2Name, Version: release2Version, SHA1: newRelease2SHA}, LocalPath: "not-used", } return local, nil @@ -170,8 +170,8 @@ var _ = Describe("UpdateStemcell", func() { Expect(updatedLockfile.Releases).To(HaveLen(2)) Expect(updatedLockfile.Releases).To(ContainElement( cargo.ComponentLock{ - Name: release1Name, - Version: release1Version, + Name: release1Name, + Version: release1Version, SHA1: newRelease1SHA, RemoteSource: publishableReleaseSourceID, RemotePath: newRelease1RemotePath, @@ -179,8 +179,8 @@ var _ = Describe("UpdateStemcell", func() { )) Expect(updatedLockfile.Releases).To(ContainElement( cargo.ComponentLock{ - Name: release2Name, - Version: release2Version, + Name: release2Name, + Version: release2Version, SHA1: newRelease2SHA, RemoteSource: unpublishableReleaseSourceID, RemotePath: newRelease2RemotePath, @@ -221,9 +221,9 @@ var _ = Describe("UpdateStemcell", func() { Expect(actualDir).To(Equal(releasesDirPath)) Expect(remote1).To(Equal( component.Lock{ - Name: release1Name, Version: release1Version, - RemotePath: newRelease1RemotePath, - RemoteSource: publishableReleaseSourceID, + Name: release1Name, Version: release1Version, + RemotePath: newRelease1RemotePath, + RemoteSource: publishableReleaseSourceID, }, )) @@ -231,9 +231,9 @@ var _ = Describe("UpdateStemcell", func() { Expect(actualDir).To(Equal(releasesDirPath)) Expect(remote2).To(Equal( component.Lock{ - Name: release2Name, Version: release2Version, - RemotePath: newRelease2RemotePath, - RemoteSource: unpublishableReleaseSourceID, + Name: release2Name, Version: release2Version, + RemotePath: newRelease2RemotePath, + RemoteSource: unpublishableReleaseSourceID, }, )) }) @@ -342,8 +342,8 @@ var _ = Describe("UpdateStemcell", func() { Expect(updatedLockfile.Releases).To(HaveLen(2)) Expect(updatedLockfile.Releases).To(ContainElement( cargo.ComponentLock{ - Name: release1Name, - Version: release1Version, + Name: release1Name, + Version: release1Version, SHA1: newRelease1SHA, RemoteSource: publishableReleaseSourceID, RemotePath: newRelease1RemotePath, @@ -351,8 +351,8 @@ var _ = Describe("UpdateStemcell", func() { )) Expect(updatedLockfile.Releases).To(ContainElement( cargo.ComponentLock{ - Name: release2Name, - Version: release2Version, + Name: release2Name, + Version: release2Version, SHA1: newRelease2SHA, RemoteSource: unpublishableReleaseSourceID, RemotePath: newRelease2RemotePath, diff --git a/internal/commands/upload_release_test.go b/internal/commands/upload_release_test.go index 058316792..0b4b9d7cf 100644 --- a/internal/commands/upload_release_test.go +++ b/internal/commands/upload_release_test.go @@ -81,8 +81,8 @@ var _ = Describe("UploadRelease", func() { BeforeEach(func() { releaseUploader.GetMatchedReleaseReturns(component.Lock{ Name: "banana", Version: "1.2.3", - RemotePath: "banana/banana-1.2.3.tgz", - RemoteSource: "orange-bucket", + RemotePath: "banana/banana-1.2.3.tgz", + RemoteSource: "orange-bucket", }, true, nil) })