Skip to content

Commit

Permalink
Throw an error on missing credentials for custom build repo (#564)
Browse files Browse the repository at this point in the history 
Signed-off-by: Paolo Di Tommaso <paolo.ditommaso@gmail.com>
  • Loading branch information
@pditommaso
pditommaso committed Jul 22, 2024
1 parent c118f0d commit 760f217
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 55 deletions.
12 changes: 11 additions & 1 deletion src/main/groovy/io/seqera/wave/service/inspect/ContainerInspectServiceImpl.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import io.seqera.wave.core.ContainerPath
import io.seqera.wave.core.RegistryProxyService
import io.seqera.wave.core.spec.ConfigSpec
import io.seqera.wave.core.spec.ContainerSpec
import io.seqera.wave.exception.BadRequestException
import io.seqera.wave.http.HttpClientFactory
import io.seqera.wave.model.ContainerCoordinates
import io.seqera.wave.proxy.ProxyClient
Expand Down Expand Up @@ -91,7 +92,16 @@ class ContainerInspectServiceImpl implements ContainerInspectService {
repos.add(buildRepo)
if( cacheRepo )
repos.add(cacheRepo)
return credsJson(repos, identity)
final result = credsJson(repos, identity)
if( buildRepo && !result.contains(host0(buildRepo)) )
throw new BadRequestException("Missing credentials for target build repository: $buildRepo")
if( cacheRepo && !result.contains(host0(cacheRepo)) )
throw new BadRequestException("Missing credentials for target cache repository: $buildRepo")
return result
}

static protected String host0(String repo) {
repo.tokenize('/')[0]
}

protected String credsJson(Set<String> repositories, PlatformId identity) {
Expand Down
58 changes: 6 additions & 52 deletions src/test/groovy/io/seqera/wave/controller/ContainerControllerHttpTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import io.seqera.wave.service.pairing.PairingService
import io.seqera.wave.service.pairing.PairingServiceImpl
import io.seqera.wave.tower.User
import io.seqera.wave.tower.auth.JwtAuth
import io.seqera.wave.tower.client.ListCredentialsResponse
import io.seqera.wave.tower.client.TowerClient
import io.seqera.wave.tower.client.UserInfoResponse
import jakarta.inject.Inject
Expand Down Expand Up @@ -307,103 +306,58 @@ class ContainerControllerHttpTest extends Specification {
}

def 'should get the correct image name with imageSuffix name strategy'(){
given:
def endpoint = 'http://cloud.seqera.io'
def token = 'foo'
def refresh = 'foo2'
def auth = JwtAuth.of(endpoint, token, refresh)
and:
pairingService.getPairingRecord(TOWER_SERVICE, endpoint) >> { new PairingRecord('tower', endpoint) }
towerClient.userInfo(endpoint, auth) >> CompletableFuture.completedFuture(new UserInfoResponse(user:new User(id:1)))
towerClient.listCredentials(_,_,_) >> CompletableFuture.completedFuture(new ListCredentialsResponse(credentials:[]))

when:
def cfg = new ContainerConfig(workingDir: '/foo')
def packages = new PackagesSpec(channels: ['conda-forge', 'bioconda'], entries: ['salmon'], type: 'CONDA')
SubmitContainerTokenRequest request =
new SubmitContainerTokenRequest(
towerAccessToken: token,
towerRefreshToken: refresh,
towerEndpoint: endpoint,
towerWorkspaceId: 10,
nameStrategy: "imageSuffix",
packages: packages,
freeze: true,
buildRepository: "registry/repository")
buildRepository: "docker.io/foo/test")
and:
def response = httpClient
.toBlocking()
.exchange(HttpRequest.POST("/v1alpha2/container", request), SubmitContainerTokenResponse)
.body()

then:
response.targetImage.startsWith("registry/repository/salmon")
response.targetImage.startsWith("docker.io/foo/test/salmon")
}

def 'should get the correct image name with tagPrefix name strategy'(){
given:
def endpoint = 'http://cloud.seqera.io'
def token = 'foo'
def refresh = 'foo2'
def auth = JwtAuth.of(endpoint, token, refresh)
and:
pairingService.getPairingRecord(TOWER_SERVICE, endpoint) >> { new PairingRecord('tower', endpoint) }
towerClient.userInfo(endpoint, auth) >> CompletableFuture.completedFuture(new UserInfoResponse(user:new User(id:1)))
towerClient.listCredentials(_,_,_) >> CompletableFuture.completedFuture(new ListCredentialsResponse(credentials:[]))

when:
def cfg = new ContainerConfig(workingDir: '/foo')
def packages = new PackagesSpec(channels: ['conda-forge', 'bioconda'], entries: ['salmon'], type: 'CONDA')
SubmitContainerTokenRequest request =
new SubmitContainerTokenRequest(
towerAccessToken: token,
towerRefreshToken: refresh,
towerEndpoint: endpoint,
towerWorkspaceId: 10,
nameStrategy: "tagPrefix",
packages: packages,
freeze: true,
buildRepository: "registry/repository")
buildRepository: "docker.io/foo/test")
and:
def response = httpClient
.toBlocking()
.exchange(HttpRequest.POST("/v1alpha2/container", request), SubmitContainerTokenResponse)
.body()

then:
response.targetImage.startsWith("registry/repository:salmon")
response.targetImage.startsWith("docker.io/foo/test:salmon")
}

def 'should get the correct image name with default name strategy'(){
given:
def endpoint = 'http://cloud.seqera.io'
def token = 'foo'
def refresh = 'foo2'
def auth = JwtAuth.of(endpoint, token, refresh)
and:
pairingService.getPairingRecord(TOWER_SERVICE, endpoint) >> { new PairingRecord('tower', endpoint) }
towerClient.userInfo(endpoint, auth) >> CompletableFuture.completedFuture(new UserInfoResponse(user:new User(id:1)))
towerClient.listCredentials(_,_,_) >> CompletableFuture.completedFuture(new ListCredentialsResponse(credentials:[]))

when:
def cfg = new ContainerConfig(workingDir: '/foo')
def packages = new PackagesSpec(channels: ['conda-forge', 'bioconda'], entries: ['salmon'], type: 'CONDA')
SubmitContainerTokenRequest request =
new SubmitContainerTokenRequest(
towerAccessToken: token,
towerRefreshToken: refresh,
towerEndpoint: endpoint,
towerWorkspaceId: 10,
packages: packages,
freeze: true,
buildRepository: "registry/repository")
buildRepository: "docker.io/foo/test")
and:
def response = httpClient
.toBlocking()
.exchange(HttpRequest.POST("/v1alpha2/container", request), SubmitContainerTokenResponse)
.body()

then:
response.targetImage.startsWith("registry/repository:salmon")
response.targetImage.startsWith("docker.io/foo/test:salmon")
}
}
11 changes: 9 additions & 2 deletions src/test/groovy/io/seqera/wave/service/builder/ContainerBuildServiceTest.groovy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,8 +93,6 @@ class ContainerBuildServiceTest extends Specification implements RedisTestContai

when:
def result = service.launch(req)
and:
println result.logs
then:
result.id
result.startTime
Expand Down Expand Up @@ -589,4 +587,13 @@ class ContainerBuildServiceTest extends Specification implements RedisTestContai
record2.buildId == request.buildId
record2.digest == 'abc123'
}

def 'should return only the host name' () {
expect:
ContainerInspectServiceImpl.host0(CONTAINER) == EXPECTED
where:
CONTAINER | EXPECTED
'docker.io' | 'docker.io'
'docker.io/foo/'| 'docker.io'
}
}

0 comments on commit 760f217

Please sign in to comment.