Support for Cargo (#376)

Author: Shimi Bandiel

api/src/main/java/org/jfrog/artifactory/client/model/repository/settings/CargoRepositorySettings.java

@@ -0,0 +1,10 @@
+package org.jfrog.artifactory.client.model.repository.settings;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public interface CargoRepositorySettings extends RepositorySettings {
+    String getGitRegistryUrl();
+    Boolean isCargoInternalIndex();
+    Boolean isCargoAnonymousAccess();
+}

services/src/main/java/org/jfrog/artifactory/client/impl/jackson/RepositorySettingsMixIn.java

@@ -41,7 +41,8 @@
     @JsonSubTypes.Type(value = CondaRepositorySettingsImpl.class, name = "conda"),
     @JsonSubTypes.Type(value = PuppetRepositorySettingsImpl.class, name = "puppet"),
     @JsonSubTypes.Type(value = HelmRepositorySettingsImpl.class, name = "helm"),
-    @JsonSubTypes.Type(value = GoRepositorySettingsImpl.class, name = "go")
+    @JsonSubTypes.Type(value = GoRepositorySettingsImpl.class, name = "go"),
+    @JsonSubTypes.Type(value = CargoRepositorySettingsImpl.class, name = "cargo")
 })
 
 public abstract class RepositorySettingsMixIn {

services/src/main/java/org/jfrog/artifactory/client/model/impl/FederatedRepositoryBuilderImpl.java

@@ -16,7 +16,7 @@
  */
 public class FederatedRepositoryBuilderImpl extends NonVirtualRepositoryBuilderBase<FederatedRepositoryBuilder, FederatedRepository> implements FederatedRepositoryBuilder {
     private static Set<PackageType> federatedRepositorySupportedTypes = new HashSet<>(Arrays.asList(
-            bower, cocoapods, cran, conda, debian, docker, gems, generic, gitlfs, gradle, ivy, maven, npm, nuget, opkg, pypi, sbt, vagrant, yum, rpm, composer, conan, chef, puppet, helm, go
+            bower, cocoapods, cran, conda, debian, docker, gems, generic, gitlfs, gradle, ivy, maven, npm, nuget, opkg, pypi, sbt, vagrant, yum, rpm, composer, conan, chef, puppet, helm, go, cargo
     ));
 
     protected List<FederatedMember> members = new ArrayList<>();

services/src/main/java/org/jfrog/artifactory/client/model/impl/LocalRepositoryBuilderImpl.java

@@ -17,7 +17,7 @@
  */
 public class LocalRepositoryBuilderImpl extends NonVirtualRepositoryBuilderBase<LocalRepositoryBuilder, LocalRepository> implements LocalRepositoryBuilder {
     private static Set<PackageType> localRepositorySupportedTypes = new HashSet<PackageType>(Arrays.asList(
-            bower, cocoapods, cran, conda, debian, docker, gems, generic, gitlfs, gradle, ivy, maven, npm, nuget, opkg, pypi, sbt, vagrant, yum, rpm, composer, conan, chef, puppet, helm, go
+            bower, cocoapods, cran, conda, debian, docker, gems, generic, gitlfs, gradle, ivy, maven, npm, nuget, opkg, pypi, sbt, vagrant, yum, rpm, composer, conan, chef, puppet, helm, go, cargo
     ));
 
     protected LocalRepositoryBuilderImpl() {

services/src/main/java/org/jfrog/artifactory/client/model/impl/PackageTypeImpl.java

@@ -31,7 +31,8 @@ public enum PackageTypeImpl implements PackageType {
     chef,
     puppet,
     helm,
-    go;
+    go,
+    cargo;
 
     @Override
     public boolean isCustom() {

services/src/main/java/org/jfrog/artifactory/client/model/impl/RemoteRepositoryBuilderImpl.java

@@ -17,7 +17,7 @@
  */
 public class RemoteRepositoryBuilderImpl extends NonVirtualRepositoryBuilderBase<RemoteRepositoryBuilder, RemoteRepository> implements RemoteRepositoryBuilder {
     private static Set<PackageType> remoteRepositorySupportedTypes = new HashSet<PackageType>(Arrays.asList(
-            bower, cocoapods, cran, conda, debian, docker, gems, generic, gitlfs, gradle, ivy, maven, npm, nuget, opkg, p2, pypi, sbt, vcs, yum, rpm, composer, conan, chef, puppet, helm, go
+            bower, cocoapods, cran, conda, debian, docker, gems, generic, gitlfs, gradle, ivy, maven, npm, nuget, opkg, p2, pypi, sbt, vcs, yum, rpm, composer, conan, chef, puppet, helm, go, cargo
     ));
 
     private String url;

services/src/main/java/org/jfrog/artifactory/client/model/repository/settings/impl/CargoRepositorySettingsImpl.java

@@ -0,0 +1,63 @@
+package org.jfrog.artifactory.client.model.repository.settings.impl;
+
+import org.jfrog.artifactory.client.model.PackageType;
+import org.jfrog.artifactory.client.model.impl.PackageTypeImpl;
+import org.jfrog.artifactory.client.model.repository.settings.AbstractRepositorySettings;
+import org.jfrog.artifactory.client.model.repository.settings.CargoRepositorySettings;
+
+import java.util.Objects;
+
+public class CargoRepositorySettingsImpl extends AbstractRepositorySettings implements CargoRepositorySettings {
+    public static String defaultLayout = "simple-default";
+    private String gitRegistryUrl;
+    private Boolean cargoInternalIndex;
+    private Boolean cargoAnonymousAccess;
+
+    public CargoRepositorySettingsImpl() {
+        super(defaultLayout);
+    }
+
+    public PackageType getPackageType() {
+        return PackageTypeImpl.cargo;
+    }
+
+    @Override
+    public String getGitRegistryUrl() {
+        return gitRegistryUrl;
+    }
+
+    public void setGitRegistryUrl(String tRegistryUrl) {
+        this.gitRegistryUrl = tRegistryUrl;
+    }
+
+    @Override
+    public Boolean isCargoInternalIndex() {
+        return cargoInternalIndex;
+    }
+
+    public void setCargoInternalIndex(Boolean cargoInternalIndex) {
+        this.cargoInternalIndex = cargoInternalIndex;
+    }
+
+    @Override
+    public Boolean isCargoAnonymousAccess() {
+        return cargoAnonymousAccess;
+    }
+
+    public void setCargoAnonymousAccess(Boolean cargoAnonymousAccess) {
+        this.cargoAnonymousAccess = cargoAnonymousAccess;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+        CargoRepositorySettingsImpl that = (CargoRepositorySettingsImpl) o;
+        return Objects.equals(gitRegistryUrl, that.gitRegistryUrl) && Objects.equals(cargoInternalIndex, that.cargoInternalIndex) && Objects.equals(cargoAnonymousAccess, that.cargoAnonymousAccess);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), gitRegistryUrl, cargoInternalIndex, cargoAnonymousAccess);
+    }
+}

services/src/test/groovy/org/jfrog/artifactory/client/CargoPackageTypeRepositoryTests.groovy

@@ -0,0 +1,89 @@
+package org.jfrog.artifactory.client
+
+import org.hamcrest.CoreMatchers
+import org.jfrog.artifactory.client.model.RepositoryType
+import org.jfrog.artifactory.client.model.repository.settings.RepositorySettings
+import org.jfrog.artifactory.client.model.repository.settings.impl.CargoRepositorySettingsImpl
+import org.testng.annotations.BeforeMethod
+import org.testng.annotations.Test
+
+class CargoPackageTypeRepositoryTests extends BaseRepositoryTests {
+
+    CargoPackageTypeRepositoryTests() {
+        remoteRepoUrl = "https://index.crates.io"
+    }
+
+    @Override
+    RepositorySettings getRepositorySettings(RepositoryType repositoryType) {
+        def settings = new CargoRepositorySettingsImpl()
+
+        settings.with {
+            // remote
+            cargoAnonymousAccess = rnd.nextBoolean()
+            cargoInternalIndex = rnd.nextBoolean()
+            gitRegistryUrl = "https://index.crates.io/"
+        }
+
+        return settings
+    }
+
+    @BeforeMethod
+    protected void setUp() {
+        prepareVirtualRepo = false
+        super.setUp()
+    }
+
+    @Test(groups = "cargoPackageTypeRepo")
+    void testCargoLocalRepo() {
+        artifactory.repositories().create(0, localRepo)
+        def expectedSettings = localRepo.repositorySettings
+
+        def resp = artifactory.repository(localRepo.getKey()).get()
+        assertThat(resp, CoreMatchers.notNullValue())
+        assertThat(resp.repoLayoutRef, CoreMatchers.is(CargoRepositorySettingsImpl.defaultLayout))
+        resp.getRepositorySettings().with {
+            assertThat(packageType, CoreMatchers.is(expectedSettings.getPackageType()))
+            assertThat(repoLayout, CoreMatchers.is(expectedSettings.getRepoLayout()))
+
+            // remote
+            assertThat(cargoInternalIndex, CoreMatchers.is(expectedSettings.cargoInternalIndex))
+            assertThat(cargoAnonymousAccess, CoreMatchers.is(expectedSettings.cargoAnonymousAccess))
+        }
+    }
+
+    @Test(groups = "cargoPackageTypeRepo")
+    void testCargoFederatedRepo() {
+        artifactory.repositories().create(0, federatedRepo)
+        def expectedSettings = federatedRepo.repositorySettings
+
+        def resp = artifactory.repository(federatedRepo.getKey()).get()
+        assertThat(resp, CoreMatchers.notNullValue())
+        assertThat(resp.repoLayoutRef, CoreMatchers.is(CargoRepositorySettingsImpl.defaultLayout))
+        resp.getRepositorySettings().with {
+            assertThat(packageType, CoreMatchers.is(expectedSettings.getPackageType()))
+            assertThat(repoLayout, CoreMatchers.is(expectedSettings.getRepoLayout()))
+
+            // remote
+            assertThat(cargoInternalIndex, CoreMatchers.is(expectedSettings.cargoInternalIndex))
+            assertThat(cargoAnonymousAccess, CoreMatchers.is(expectedSettings.cargoAnonymousAccess))
+        }
+    }
+
+    @Test(groups = "cargoPackageTypeRepo")
+    void testCargoRemoteRepo() {
+        artifactory.repositories().create(0, remoteRepo)
+        def expectedSettings = remoteRepo.repositorySettings
+
+        def resp = artifactory.repository(remoteRepo.getKey()).get()
+        assertThat(resp, CoreMatchers.notNullValue())
+        assertThat(resp.repoLayoutRef, CoreMatchers.is(CargoRepositorySettingsImpl.defaultLayout))
+        resp.getRepositorySettings().with {
+            assertThat(packageType, CoreMatchers.is(expectedSettings.getPackageType()))
+            assertThat(repoLayout, CoreMatchers.is(expectedSettings.getRepoLayout()))
+
+            // remote
+            assertThat(cargoInternalIndex, CoreMatchers.is(expectedSettings.cargoInternalIndex))
+            assertThat(cargoAnonymousAccess, CoreMatchers.is(expectedSettings.cargoAnonymousAccess))
+        }
+    }
+}