Skip to content

Commit

Permalink
Merge branch 'master' into 478-use-buildkit-for-container-image-builds
Browse files Browse the repository at this point in the history
  • Loading branch information
munishchouhan authored Jun 9, 2024
2 parents fb239a4 + 002519c commit b467a66
Show file tree
Hide file tree
Showing 9 changed files with 48 additions and 21 deletions.
1 change: 1 addition & 0 deletions .codespellignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
carrer
26 changes: 26 additions & 0 deletions .github/workflows/codespell.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
name: Codespell

on:
push:
branches: [master]
pull_request:
branches: [master]

permissions:
contents: read

jobs:
codespell:
name: Check for spelling errors
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Codespell
uses: codespell-project/actions-codespell@v2
with:
only_warn: 1
ignore_words_file: .codespellignore
exclude_file: src/main/resources/application-reserved-words.yml
14 changes: 7 additions & 7 deletions changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
- Fix Containerfile encoding (#441) [d742aa67]
- Improve error reporting for AWS ECR auth failure [06141219]
- Remove unused exception [bc5570b3]
- Fix syntax error repored by Intellij [343887a4]
- Fix syntax error reported by Intellij [343887a4]
- Fix Build pod name (#438) [4e54ce1a]
- Fix RedisTestContainer flaky test (#436) [a90b44e5]
- Update platform api endpoint to api.cloud.seqera.io (#434) [1e43e8b1]
Expand All @@ -87,7 +87,7 @@
- Add fixed executor to future store [9f61abe9]
- Add timeout retry limiter [0a98aa96]
- Fix failing tests [eeb9ddfe]
- Add thred pool monitor cron [a1cdcc13]
- Add thread pool monitor cron [a1cdcc13]
- Bump corretto-17.0.10-al2023-jemalloc as base image [7238a86d]
- Evict status redesigned (#419) [9cf07b56]
- Add API and UI to evict a wave request from token cache (#410) [5833c18d]
Expand Down Expand Up @@ -143,7 +143,7 @@ v1.1.7 - 19 Dec 2023
- Implements streaming client for large binary downloads (#358) [592ce522]
- Update failing tests [31edb5e7]
- Fix typo in comment [c10cc472]
- Remove unsused consts [24315f03]
- Remove unused consts [24315f03]
- Refactor build settings via BuildConfig class (#324) [f6924f4a]
- Bump trivy 0.47.0 [3ff4a89f]

Expand Down Expand Up @@ -463,7 +463,7 @@ v0.29.0 - 5 Apr 2023

v0.28.6 - 5 Apr 2023
- Add consumers list [7d561f6d]
- Use singleton websocket instace [c0390502]
- Use singleton websocket instance [c0390502]
- Add custom MN worker pool [be3cbe78]
- Remove redis session [b23c7225]
- Improve logs [0f29cef7]
Expand All @@ -482,7 +482,7 @@ v0.28.2 - 4 Apr 2023
- Improve future poll + refactor [53c6a335]

v0.28.1 - 4 Apr 2023
- Fix missing timeout exeception on redis future [a9d640a0]
- Fix missing timeout exception on redis future [a9d640a0]
- Minor logging changes [c81e78bf] [4943ba6f] [6768b7eb]
- Update application dev [db4ae108]

Expand Down Expand Up @@ -684,7 +684,7 @@ v0.21.6 - 17 Oct 2022 [BROKEN BASE IMAGE]
- Improve registry auth lookup error [0f696146]

v0.21.5 - 4 Oct 2022
- Rollback timestamp and fingerpint fields [466b3a46] <Paolo Di Tommaso>
- Rollback timestamp and fingerprint fields [466b3a46] <Paolo Di Tommaso>

v0.21.4 - 3 Oct 2022
- Count all manifest digest requests [02435bff] <Paolo Di Tommaso>
Expand Down Expand Up @@ -795,7 +795,7 @@ v0.14.2 - 7 Sep 2022

v0.14.1 - 5 Sep 2022
- Fix registry auth invalid cache key [15bd1a57]
- Fix retry policy for temportary IO exeception [15e2723f]
- Fix retry policy for temporary IO exception [15e2723f]
- Add support for Azure CR [cac5b661]
- Improve logging [7af3109f]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,14 @@ import io.seqera.wave.util.StringUtils
import jakarta.inject.Inject

/**
* Basic bean to log some info at boostrap
* Basic bean to log some info at bootstrap
*
* @author Paolo Di Tommaso <paolo.ditommaso@gmail.com>
*/
@Slf4j
@Context
@CompileStatic
class Boostrap {
class Bootstrap {

@Inject RegistryCredentialsProvider provider

Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/io/seqera/wave/auth/RegistryAuth.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import groovy.transform.ToString
class RegistryAuth {

private static final Pattern AUTH = ~/(?i)(?<type>.+) realm="(?<realm>[^"]+)",service="(?<service>[^"]+)"/
// some registries doesnt send the service
// some registries doesn't send the service
private static final Pattern AUTH2 = ~/(?i)(?<type>.+) realm="(?<realm>[^"]+)"/

enum Type { Basic, Bearer }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ abstract class AbstractMessageQueue<M> implements Runnable {
*
* @param target
* Identify the websocket target i.e. the remote endpoint. For the same target
* it's possible to have one ore more clients
* it's possible to have more than one client
* @param clientId
* A unique id for the Websocket client instance
* @param sender
Expand All @@ -139,7 +139,7 @@ abstract class AbstractMessageQueue<M> implements Runnable {
*
* @param target
* Identify the websocket target i.e. the remote endpoint. For the same target
* it's possible to have one ore more clients
* it's possible to have one more than one client
* @param clientId
* A unique id for the Websocket client instance
*/
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/io/seqera/wave/tower/auth/JwtConfig.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class JwtConfig {
Duration monitorInterval

/**
* Determine the delay after which the JWT monitor service is launcher on boostrap
* Determine the delay after which the JWT monitor service is launcher on bootstrap
*/
@Value('${wave.jwt.monitor.delay:5s}')
Duration monitorDelay
Expand Down
1 change: 1 addition & 0 deletions src/main/resources/application-reserved-words.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1341,6 +1341,7 @@ wave:
- nigre
- nil
- nimphomania
- nymphomania
- nip
- nipple
- nipplering
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ class TowerClientUrlCompositionTest extends Specification{
endpoint || _
null || _
"" || _
"gar bage" || _
"foo bar" || _
"tower.io" || _
"ftp://xyz" || _

Expand All @@ -75,20 +75,19 @@ class TowerClientUrlCompositionTest extends Specification{

def 'fail compose list credentials with invalid towerEndpoint'() {
when:
TowerClient.listCredentialsEndpoint(endpoint, workspaceId).toString()
TowerClient.listCredentialsEndpoint(ENDPOINT, WORKSPACE_ID).toString()

then:
thrown(IllegalArgumentException)

where:

endpoint | workspaceId
ENDPOINT | WORKSPACE_ID
null | null
null | 1
"" | null
"" | 1
"gar bage" | null
"gar bage" | 1
"foo bar" | null
"foo bar" | 1
"tower.io" | null
"tower.io" | 1
"ftp://xyz" | null
Expand Down Expand Up @@ -127,8 +126,8 @@ class TowerClientUrlCompositionTest extends Specification{
null | "10" | "10" | null
"" | "10" | "10" | null
"" | "10" | "10" | null
"gar bage" | "10" | "10" | 1
"gar bage" | "10" | "10" | null
"foo bar" | "10" | "10" | 1
"foo bar" | "10" | "10" | null
"tower.io" | "10" | "10" | 1
"tower.io" | "10" | "10" | null
"ftp://xyz" | "10" | "10" | 1
Expand Down

0 comments on commit b467a66

Please sign in to comment.