Merge pull request TencentBlueKing#2910 from liuliaozhong/master_issu…

…e_2830 feat: 增加查询文件源与凭证详情的ApiGW接口 TencentBlueKing#2830
wangyu096 · Apr 18, 2024 · 243d6d5 · 243d6d5
2 parents f18dc03 + 1caa800
commit 243d6d5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...b-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/model/dto/FileSourceDTO.java b/...b-file-gateway/src/main/java/com/tencent/bk/job/file_gateway/model/dto/FileSourceDTO.java
@@ -165,7 +165,8 @@ public static EsbFileSourceV3DTO toEsbFileSourceV3DTO(FileSourceDTO fileSourceDT
         fileSource.setAlias(fileSourceDTO.getAlias());
         fileSource.setCredentialId(fileSourceDTO.getCredentialId());
         fileSource.setEnable(fileSourceDTO.getEnable());
-        fileSource.setFileSourceTypeCode(fileSourceDTO.getFileSourceType().getCode());
+        fileSource.setFileSourceTypeCode(fileSourceDTO.getFileSourceType() != null ?
+            fileSourceDTO.getFileSourceType().getCode() : null);
         fileSource.setPublicFlag(fileSourceDTO.getPublicFlag());
         fileSource.setStatus(fileSourceDTO.getStatus());
         fileSource.setCreateTime(fileSourceDTO.getCreateTime());

diff --git a/...s/openapi/src/test/java/com/tencent/bk/job/api/v3/testcase/FileSourceResourceAPITest.java b/...s/openapi/src/test/java/com/tencent/bk/job/api/v3/testcase/FileSourceResourceAPITest.java
@@ -172,6 +172,7 @@ void testUpdateFileSource() {
             req.setScopeId(String.valueOf(TestProps.DEFAULT_BIZ));
             req.setScopeType(ResourceScopeTypeEnum.BIZ.getValue());
             req.setCode(fileSourceSimpleInfoV3DTO.getCode());
+            req.setType(FileSourceTypeEnum.BLUEKING_ARTIFACTORY.name());
             req.setAlias(TestValueGenerator.generateUniqueStrValue("update_file_source_alias", 50));
             given().spec(ApiUtil.requestSpec(TestProps.DEFAULT_TEST_USER))
                 .body(JsonUtil.toJson(req))