diff --git a/src/backend/settings.gradle.kts b/src/backend/settings.gradle.kts index fedb4a3e12..f16ee516f8 100644 --- a/src/backend/settings.gradle.kts +++ b/src/backend/settings.gradle.kts @@ -89,5 +89,4 @@ includeAll(":ddc") includeAll(":svn") includeAll(":archive") includeAll(":s3") -includeAll(":proxy") includeAll(":router-controller") diff --git a/src/proxy/.gitignore b/src/proxy/.gitignore new file mode 100644 index 0000000000..fdb28c15c6 --- /dev/null +++ b/src/proxy/.gitignore @@ -0,0 +1,17 @@ +.idea/ +.gradle/ +build/ +target/ +out/ +release/ +reports/ +*.iml +.DS_Store +*.log +node_modules/ + +data/ +logs/ +runtime/ +http-client.private.env.json +.codecc diff --git a/src/backend/proxy/api-proxy/build.gradle.kts b/src/proxy/api-proxy/build.gradle.kts similarity index 94% rename from src/backend/proxy/api-proxy/build.gradle.kts rename to src/proxy/api-proxy/build.gradle.kts index 46c65e7fb3..0e336a54a4 100644 --- a/src/backend/proxy/api-proxy/build.gradle.kts +++ b/src/proxy/api-proxy/build.gradle.kts @@ -30,6 +30,6 @@ */ dependencies { - api(project(":auth:api-auth")) - api(project(":generic:api-generic")) + api("com.tencent.bk.repo:api-auth") + api("com.tencent.bk.repo:api-generic") } diff --git a/src/backend/proxy/api-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/constant/Constans.kt b/src/proxy/api-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/constant/Constans.kt similarity index 100% rename from src/backend/proxy/api-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/constant/Constans.kt rename to src/proxy/api-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/constant/Constans.kt diff --git a/src/backend/proxy/biz-proxy/build.gradle.kts b/src/proxy/biz-proxy/build.gradle.kts similarity index 86% rename from src/backend/proxy/biz-proxy/build.gradle.kts rename to src/proxy/biz-proxy/build.gradle.kts index 76744ba1c2..ed839371d6 100644 --- a/src/backend/proxy/biz-proxy/build.gradle.kts +++ b/src/proxy/biz-proxy/build.gradle.kts @@ -30,8 +30,8 @@ */ dependencies { - implementation(project(":proxy:api-proxy")) - implementation(project(":common:common-service")) - implementation(project(":common:common-security")) - implementation(project(":common:common-artifact:artifact-service")) + implementation(project(":api-proxy")) + implementation("com.tencent.bk.repo:common-service") + implementation("com.tencent.bk.repo:common-security") + implementation("com.tencent.bk.repo:artifact-service") } diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/GenericArtifactInfoResolver.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/GenericArtifactInfoResolver.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/GenericArtifactInfoResolver.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/GenericArtifactInfoResolver.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyArtifactConfigurer.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyArtifactConfigurer.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyArtifactConfigurer.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyArtifactConfigurer.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyLocalRepository.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyLocalRepository.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyLocalRepository.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyLocalRepository.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyRemoteRepository.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyRemoteRepository.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyRemoteRepository.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyRemoteRepository.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyVirtualRepository.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyVirtualRepository.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyVirtualRepository.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/ProxyVirtualRepository.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/context/ProxyArtifactClient.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/context/ProxyArtifactClient.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/context/ProxyArtifactClient.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/context/ProxyArtifactClient.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/resource/ProxyNodeResource.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/resource/ProxyNodeResource.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/resource/ProxyNodeResource.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/resource/ProxyNodeResource.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxyStorageService.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxyStorageService.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxyStorageService.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxyStorageService.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt similarity index 98% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt index 2fa6727aab..5c2815d719 100644 --- a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt +++ b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/artifact/storage/ProxySyncFileVisitor.kt @@ -82,7 +82,6 @@ class ProxySyncFileVisitor( val storageKey = if (syncFile.length() == 0L) null else syncFile.readText() val sha256 = file.canonicalPath.split(File.separator).last() -// val url = "$gateway:25903/proxy/replica/blob/push" val url = "$gateway/replication/proxy/replica/blob/push" logger.info("start sync file[${file.canonicalPath}]") val inputStream = if (rate > 0) { diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/controller/GenericController.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/controller/GenericController.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/controller/GenericController.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/controller/GenericController.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyHeartbeatJob.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyHeartbeatJob.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyHeartbeatJob.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyHeartbeatJob.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyShutdownRunner.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyShutdownRunner.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyShutdownRunner.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyShutdownRunner.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyStartupRunner.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyStartupRunner.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyStartupRunner.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxyStartupRunner.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxySyncJob.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxySyncJob.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxySyncJob.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/job/ProxySyncJob.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOpLogConfiguration.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOpLogConfiguration.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOpLogConfiguration.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOpLogConfiguration.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOperateLogServiceImpl.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOperateLogServiceImpl.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOperateLogServiceImpl.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/log/ProxyOperateLogServiceImpl.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyAuthenticationManager.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyAuthenticationManager.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyAuthenticationManager.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyAuthenticationManager.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyProjectPermissionAspect.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyProjectPermissionAspect.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyProjectPermissionAspect.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxyProjectPermissionAspect.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxySecurityConfiguration.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxySecurityConfiguration.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxySecurityConfiguration.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/security/ProxySecurityConfiguration.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/DownloadService.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/DownloadService.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/DownloadService.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/DownloadService.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/UploadService.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/UploadService.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/UploadService.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/service/UploadService.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/ProxyEnv.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/ProxyEnv.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/ProxyEnv.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/ProxyEnv.kt diff --git a/src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/SessionKeyHolder.kt b/src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/SessionKeyHolder.kt similarity index 100% rename from src/backend/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/SessionKeyHolder.kt rename to src/proxy/biz-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/util/SessionKeyHolder.kt diff --git a/src/backend/proxy/boot-proxy/build.gradle.kts b/src/proxy/boot-proxy/build.gradle.kts similarity index 96% rename from src/backend/proxy/boot-proxy/build.gradle.kts rename to src/proxy/boot-proxy/build.gradle.kts index 60196d80a9..858e74f568 100644 --- a/src/backend/proxy/boot-proxy/build.gradle.kts +++ b/src/proxy/boot-proxy/build.gradle.kts @@ -30,5 +30,5 @@ */ dependencies { - implementation(project(":proxy:biz-proxy")) + implementation(project(":biz-proxy")) } diff --git a/src/backend/proxy/boot-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/ProxyApplication.kt b/src/proxy/boot-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/ProxyApplication.kt similarity index 100% rename from src/backend/proxy/boot-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/ProxyApplication.kt rename to src/proxy/boot-proxy/src/main/kotlin/com/tencent/bkrepo/proxy/ProxyApplication.kt diff --git a/src/backend/proxy/boot-proxy/src/main/resources/.proxy.properties b/src/proxy/boot-proxy/src/main/resources/.proxy.properties similarity index 99% rename from src/backend/proxy/boot-proxy/src/main/resources/.proxy.properties rename to src/proxy/boot-proxy/src/main/resources/.proxy.properties index 77f96c5fe1..0f301adf9c 100644 --- a/src/backend/proxy/boot-proxy/src/main/resources/.proxy.properties +++ b/src/proxy/boot-proxy/src/main/resources/.proxy.properties @@ -25,8 +25,10 @@ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # + bkrepo.proxy.project.id=##projectId## bkrepo.proxy.name=##name## bkrepo.proxy.secret.key=##secretKey## bkrepo.proxy.cluster.name=##clusterName## bkrepo.gateway=##gateway## + diff --git a/src/backend/proxy/boot-proxy/src/main/resources/bootstrap.yaml b/src/proxy/boot-proxy/src/main/resources/bootstrap.yaml similarity index 100% rename from src/backend/proxy/boot-proxy/src/main/resources/bootstrap.yaml rename to src/proxy/boot-proxy/src/main/resources/bootstrap.yaml diff --git a/src/proxy/build.gradle.kts b/src/proxy/build.gradle.kts new file mode 100644 index 0000000000..c54389b173 --- /dev/null +++ b/src/proxy/build.gradle.kts @@ -0,0 +1,74 @@ +/* + * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. + * + * Copyright (C) 2023 THL A29 Limited, a Tencent company. All rights reserved. + * + * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. + * + * A copy of the MIT License is included in this file. + * + * + * Terms of the MIT License: + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +plugins { + id("com.tencent.devops.boot") version Versions.DevopsBoot + id("com.tencent.devops.publish") version Versions.DevopsBoot apply false +} + +allprojects { + group=Release.Group + version=Release.Version + + + repositories { + // for debug devops-boot locally + mavenLocal() + maven("https://oss.sonatype.org/content/repositories/snapshots/") + mavenCentral() + } + + apply(plugin = "com.tencent.devops.boot") + + configurations.all { + resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.MINUTES) + } + + dependencyManagement { + imports { + mavenBom("org.springframework.cloud:spring-cloud-sleuth-otel-dependencies:${Versions.SleuthOtel}") + } + dependencies { + val bkrepoVersion = System.getProperty("bkrepo_version") ?: Versions.BkRepo + dependencySet("com.tencent.bk.repo:$bkrepoVersion") { + entry("api-auth") + entry("api-generic") + entry("common-service") + entry("common-security") + entry("artifact-service") + } + dependency("org.apache.commons:commons-text:${Versions.CommonsText}") + dependency("com.tencent.polaris:polaris-discovery-factory:${Versions.Polaris}") + dependency("com.tencent.bk.sdk:crypto-java-sdk:${Versions.CryptoJavaSdk}") + dependency("com.squareup.okhttp3:okhttp:${Versions.OKhttp}") + } + } +} diff --git a/src/proxy/buildSrc/build.gradle.kts b/src/proxy/buildSrc/build.gradle.kts new file mode 100644 index 0000000000..2241922bd6 --- /dev/null +++ b/src/proxy/buildSrc/build.gradle.kts @@ -0,0 +1,36 @@ +/* + * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. + * + * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved. + * + * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. + * + * A copy of the MIT License is included in this file. + * + * + * Terms of the MIT License: + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN + * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +plugins { + `kotlin-dsl` +} + +repositories { + mavenLocal() + maven(url = "https://mirrors.tencent.com/nexus/repository/maven-public") + mavenCentral() +} diff --git a/src/proxy/buildSrc/src/main/kotlin/Versions.kt b/src/proxy/buildSrc/src/main/kotlin/Versions.kt new file mode 100644 index 0000000000..7b105322d6 --- /dev/null +++ b/src/proxy/buildSrc/src/main/kotlin/Versions.kt @@ -0,0 +1,41 @@ +/* + * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. + * + * Copyright (C) 2022 THL A29 Limited, a Tencent company. All rights reserved. + * + * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. + * + * A copy of the MIT License is included in this file. + * + * + * Terms of the MIT License: + * --------------------------------------------------- + * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated + * documentation files (the "Software"), to deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to + * permit persons to whom the Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all copies or substantial portions of + * the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT + * LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN + * NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +object Release { + const val Group = "com.tencent.bk.repo.proxy" + const val Version = "1.0.0" +} + +object Versions { + const val DevopsBoot = "0.0.6" + const val BkRepo = "1.1.0-RELEASE" + const val OKhttp = "4.9.0" + const val Polaris = "1.5.2" + const val CommonsText = "1.9" + const val SleuthOtel = "1.0.0-M13" + const val CryptoJavaSdk = "1.1.0" +} diff --git a/src/proxy/gradle/wrapper/gradle-wrapper.jar b/src/proxy/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000..7f93135c49 Binary files /dev/null and b/src/proxy/gradle/wrapper/gradle-wrapper.jar differ diff --git a/src/proxy/gradle/wrapper/gradle-wrapper.properties b/src/proxy/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000000..f3f0da4fcc --- /dev/null +++ b/src/proxy/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/src/proxy/gradlew b/src/proxy/gradlew new file mode 100644 index 0000000000..1aa94a4269 --- /dev/null +++ b/src/proxy/gradlew @@ -0,0 +1,249 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/src/proxy/gradlew.bat b/src/proxy/gradlew.bat new file mode 100644 index 0000000000..93e3f59f13 --- /dev/null +++ b/src/proxy/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/src/backend/proxy/build.gradle.kts b/src/proxy/settings.gradle.kts similarity index 68% rename from src/backend/proxy/build.gradle.kts rename to src/proxy/settings.gradle.kts index 852d2001cd..da814f276e 100644 --- a/src/backend/proxy/build.gradle.kts +++ b/src/proxy/settings.gradle.kts @@ -1,7 +1,7 @@ /* * Tencent is pleased to support the open source community by making BK-CI 蓝鲸持续集成平台 available. * - * Copyright (C) 2023 THL A29 Limited, a Tencent company. All rights reserved. + * Copyright (C) 2024 THL A29 Limited, a Tencent company. All rights reserved. * * BK-CI 蓝鲸持续集成平台 is licensed under the MIT license. * @@ -28,3 +28,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ + +rootProject.name = "bk-repo-proxy" + +pluginManagement { + repositories { + if (System.getenv("GITHUB_WORKFLOW") == null) { + maven(url = "https://mirrors.tencent.com/nexus/repository/gradle-plugins/") + maven(url = "https://mirrors.tencent.com/nexus/repository/maven-public") + maven(url = "https://repo.spring.io/milestone") + } else { + mavenCentral() + maven(url = "https://repo.spring.io/milestone") + gradlePluginPortal() + } + } +} +// +include(":api-proxy") +include(":biz-proxy") +include(":boot-proxy")