Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor MirrorConfig #668

Merged
merged 2 commits into from
Oct 9, 2024
Merged

Refactor MirrorConfig #668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
993ec0c
move MirrorConfig to config package
munishchouhan Oct 4, 2024
fb5a9a7
Merge branch 'master' into refactor-mirror-config
munishchouhan Oct 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...a/wave/service/mirror/MirrorConfig.groovy → ...ra/wave/configuration/MirrorConfig.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/

package io.seqera.wave.service.mirror
package io.seqera.wave.configuration

import java.time.Duration

Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/io/seqera/wave/service/job/JobFactory.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import groovy.transform.CompileStatic
import io.seqera.wave.configuration.BlobCacheConfig
import io.seqera.wave.configuration.ScanConfig
import io.seqera.wave.service.builder.BuildRequest
import io.seqera.wave.service.mirror.MirrorConfig
import io.seqera.wave.configuration.MirrorConfig
import io.seqera.wave.service.mirror.MirrorRequest
import io.seqera.wave.service.scan.ScanRequest
import jakarta.inject.Inject
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/io/seqera/wave/service/k8s/K8sService.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import io.kubernetes.client.openapi.models.V1Pod
import io.kubernetes.client.openapi.models.V1PodList
import io.seqera.wave.configuration.BlobCacheConfig
import io.seqera.wave.configuration.ScanConfig
import io.seqera.wave.service.mirror.MirrorConfig
import io.seqera.wave.configuration.MirrorConfig

/**
* Defines Kubernetes operations
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/io/seqera/wave/service/k8s/K8sServiceImpl.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ import io.seqera.wave.configuration.BlobCacheConfig
import io.seqera.wave.configuration.BuildConfig
import io.seqera.wave.configuration.ScanConfig
import io.seqera.wave.core.ContainerPlatform
import io.seqera.wave.service.mirror.MirrorConfig
import io.seqera.wave.configuration.MirrorConfig
import io.seqera.wave.service.scan.Trivy
import jakarta.inject.Inject
import jakarta.inject.Singleton
Expand Down
2 changes: 2 additions & 0 deletions src/main/groovy/io/seqera/wave/service/mirror/MirrorStateStore.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@

package io.seqera.wave.service.mirror

import io.seqera.wave.configuration.MirrorConfig

import java.time.Duration

import groovy.transform.CompileStatic
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/io/seqera/wave/service/mirror/strategy/DockerMirrorStrategy.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import groovy.json.JsonOutput
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import io.micronaut.context.annotation.Value
import io.seqera.wave.service.mirror.MirrorConfig
import io.seqera.wave.configuration.MirrorConfig
import io.seqera.wave.service.mirror.MirrorRequest
import jakarta.inject.Inject
import jakarta.inject.Singleton
Expand Down
2 changes: 1 addition & 1 deletion src/main/groovy/io/seqera/wave/service/mirror/strategy/KubeMirrorStrategy.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import io.micronaut.context.annotation.Primary
import io.micronaut.context.annotation.Requires
import io.seqera.wave.exception.BadRequestException
import io.seqera.wave.service.k8s.K8sService
import io.seqera.wave.service.mirror.MirrorConfig
import io.seqera.wave.configuration.MirrorConfig
import io.seqera.wave.service.mirror.MirrorRequest
import jakarta.inject.Inject
import jakarta.inject.Singleton
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/io/seqera/wave/service/job/JobFactoryTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import io.seqera.wave.configuration.BlobCacheConfig
import io.seqera.wave.configuration.ScanConfig
import io.seqera.wave.core.ContainerPlatform
import io.seqera.wave.service.builder.BuildRequest
import io.seqera.wave.service.mirror.MirrorConfig
import io.seqera.wave.configuration.MirrorConfig
import io.seqera.wave.service.mirror.MirrorRequest
import io.seqera.wave.service.scan.ScanRequest
import io.seqera.wave.tower.PlatformId
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/io/seqera/wave/service/k8s/K8sServiceImplTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ import io.micronaut.context.annotation.Replaces
import io.micronaut.test.extensions.spock.annotation.MicronautTest
import io.seqera.wave.configuration.BlobCacheConfig
import io.seqera.wave.configuration.ScanConfig
import io.seqera.wave.service.mirror.MirrorConfig
import io.seqera.wave.configuration.MirrorConfig
/**
*
* @author Paolo Di Tommaso <[email protected]>
Expand Down
2 changes: 1 addition & 1 deletion src/test/groovy/io/seqera/wave/service/mirror/strategy/DockerMirrorStrategyTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import spock.lang.Specification

import java.nio.file.Path

import io.seqera.wave.service.mirror.MirrorConfig
import io.seqera.wave.configuration.MirrorConfig

/**
*
Expand Down