feat(repo): add new fields for docker repositories (#52)

target · Apr 2, 2020 · a0ff7fb · a0ff7fb
1 parent c150ef8
commit a0ff7fb
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 2 deletions.
diff --git a/artifactory/artifactory-accessors.go b/artifactory/artifactory-accessors.go
diff --git a/artifactory/fixtures/repositories/local_repository.json b/artifactory/fixtures/repositories/local_repository.json
@@ -21,6 +21,7 @@
   "calculateYumMetadata" : false,
   "yumRootDepth" : 0,
   "dockerApiVersion" : "V2",
+  "blockPushingSchema1" : true,
   "enableFileListsIndexing" : "false",
   "optionalIndexCompressionFormats" : ["bz2", "lzma", "xz"],
   "xrayIndex" : false,

diff --git a/artifactory/fixtures/repositories/remote_repository.json b/artifactory/fixtures/repositories/remote_repository.json
@@ -64,5 +64,6 @@
     "source" : {
       "originAbsenceDetection" : true
     }
-  }
+  },
+  "blockPushingSchema1" : true
 }
diff --git a/artifactory/fixtures/repositories/virtual_repository.json b/artifactory/fixtures/repositories/virtual_repository.json
@@ -15,5 +15,6 @@
   "forceMavenAuthentication" : false,
   "externalDependenciesEnabled": false,
   "externalDependenciesPatterns": ["**/*microsoft*/**", "**/*github*/**"],
-  "externalDependenciesRemoteRepo": ""
+  "externalDependenciesRemoteRepo": "",
+  "resolveDockerTagsByTimestamp": false
 }
diff --git a/artifactory/repositories.go b/artifactory/repositories.go
@@ -79,6 +79,7 @@ type LocalRepository struct {
 	CalculateYumMetadata            *bool     `json:"calculateYumMetadata,omitempty"`
 	YumRootDepth                    *int      `json:"yumRootDepth,omitempty"`
 	DockerAPIVersion                *string   `json:"dockerApiVersion,omitempty"`
+	BlockPushingSchema1             *bool     `json:"blockPushingSchema1,omitempty"`
 	EnableFileListsIndexing         *bool     `json:"enableFileListsIndexing,omitempty"`
 	OptionalIndexCompressionFormats *[]string `json:"optionalIndexCompressionFormats,omitempty"`
 	XrayIndex                       *bool     `json:"xrayIndex,omitempty"`
@@ -136,6 +137,7 @@ type RemoteRepository struct {
 	ListRemoteFolderItems             *bool                   `json:"listRemoteFolderItems,omitempty"`
 	EnableTokenAuthentication         *bool                   `json:"enableTokenAuthentication,omitempty"`
 	ContentSynchronisation            *ContentSynchronisation `json:"contentSynchronisation,omitempty"`
+	BlockPushingSchema1               *bool                   `json:"blockPushingSchema1,omitempty"`
 }
 
 // ContentSynchronisation represents smart remote repository configuration
@@ -172,6 +174,7 @@ type VirtualRepository struct {
 	ExternalDependenciesEnabled                   *bool     `json:"externalDependenciesEnabled,omitempty"`
 	ExternalDependenciesPatterns                  *[]string `json:"externalDependenciesPatterns,omitempty"`
 	ExternalDependenciesRemoteRepo                *string   `json:"externalDependenciesRemoteRepo,omitempty"`
+	ResolveDockerTagsByTimestamp                  *bool     `json:"resolveDockerTagsByTimestamp,omitempty"`
 }
 
 func (v VirtualRepository) String() string {

diff --git a/artifactory/repositories_test.go b/artifactory/repositories_test.go
@@ -120,6 +120,7 @@ func Test_Repositories(t *testing.T) {
 					CalculateYumMetadata:            Bool(false),
 					YumRootDepth:                    Int(0),
 					DockerAPIVersion:                String("V2"),
+					BlockPushingSchema1:             Bool(true),
 					EnableFileListsIndexing:         Bool(false),
 					OptionalIndexCompressionFormats: &[]string{"bz2", "lzma", "xz"},
 					XrayIndex:                       Bool(false),
@@ -204,6 +205,7 @@ func Test_Repositories(t *testing.T) {
 							OriginAbsenceDetection *bool `json:"originAbsenceDetection,omitempty"`
 						}{OriginAbsenceDetection: Bool(true)},
 					},
+					BlockPushingSchema1: Bool(true),
 				}
 
 				data, _ := ioutil.ReadFile("fixtures/repositories/remote_repository.json")
@@ -235,6 +237,7 @@ func Test_Repositories(t *testing.T) {
 					ExternalDependenciesEnabled:          Bool(false),
 					ExternalDependenciesPatterns:         &[]string{"**/*microsoft*/**", "**/*github*/**"},
 					ExternalDependenciesRemoteRepo:       String(""),
+					ResolveDockerTagsByTimestamp:         Bool(false),
 				}
 
 				data, _ := ioutil.ReadFile("fixtures/repositories/virtual_repository.json")