Commit a09f7b04 authored by Vasilis Katopodis's avatar Vasilis Katopodis
Browse files

fix: update registry endpoints to ETSI environment

parent f3dc411a

.releaserc.json

+2 −2
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 
          {"type": "perf", "hidden": true},

          {"type": "test", "hidden": true}

        ],

        "issueUrlFormat": "https://gitlab.ubitech.eu/maestro-v2/mdg-hypo/org.etsi.osl.hypo.api/org.etsi.osl.hypo.api.registry/-/issues/{{id}}"

        "issueUrlFormat": "https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.api/registry/-/issues/{{id}}"

      }

    }],

    "@semantic-release/release-notes-generator",

    ["@semantic-release/gitlab", {

      "gitlabUrl": "https://gitlab.ubitech.eu/maestro-v2/mdg-hypo/org.etsi.osl.hypo.api/org.etsi.osl.hypo.api.registry"

      "gitlabUrl": "https://labs.etsi.org/rep/osl/hypo/code/org.etsi.osl.hypo.api/registry"

    }],

    ["@semantic-release/changelog",{

        "changelogFile": "./CHANGELOG.md"

README.md

+9 −9
Original line number Diff line number Diff line
@@ -154,16 +154,16 @@ Response: <b>204 No Content</b> 


<b>Add</b> Package Registry Secret:



Request: 'registry.ubitech.eu/nsit/maestro-apps/cms-api' will be the secret-name. Based on the keycloak-token the secret will be saved under the user. In this example we have service-provider keycloak-token.

Request: 'labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/cms-api' will be the secret-name. Based on the keycloak-token the secret will be saved under the user. In this example we have service-provider keycloak-token.



```

curl --location 'http://localhost:8091/registry-api/package-registry/secret/registry.ubitech.eu/nsit/maestro-apps/cms-api' \

curl --location 'http://localhost:8091/registry-api/package-registry/secret/labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/cms-api' \

--header 'Content-Type: application/json' \

--header 'Authorization: Bearer <token>' \

--data '{

"username":"cmsUser",

"password":"pass",

"url":"https://registry.ubitech.eu/nsit/maestro-apps"

"url":"https://labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests"

}'

```
@@ -174,7 +174,7 @@ Response: <b>201 Created</b> 


Request:

```

curl --location 'http://localhost:8091/registry-api/package-registry/secret/registry.ubitech.eu/nsit/maestro-apps/cms-api' \

curl --location 'http://localhost:8091/registry-api/package-registry/secret/labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/cms-api' \

--header 'Authorization: Bearer <token>'

```
@@ -182,7 +182,7 @@ Response: <b>200 OK</b> 
```

{

"password": "pass",

"url": "https://registry.ubitech.eu/nsit/maestro-apps",

"url": "https://labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests",

"username": "cmsUser"

}

```
@@ -217,10 +217,10 @@ Response: <b>200 OK</b> 
         }

      },

      {

         "id":"registry.ubitech.eu/nsit/maestro-apps/cms-api",

         "id":"labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/cms-api",

         "secretData":{

            "password":"pass",

            "url":"https://registry.ubitech.eu/nsit/maestro-apps",

            "url":"https://labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests",

            "username":"cmsUser"

         }

      },
@@ -242,7 +242,7 @@ Response: <b>200 OK</b> 


Request:

```

curl --location --request PATCH 'http://localhost:8091/registry-api/package-registry/secret/registry.ubitech.eu/nsit/maestro-apps/cms-api' \

curl --location --request PATCH 'http://localhost:8091/registry-api/package-registry/secret/labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/cms-api' \

--header 'Content-Type: application/json' \

--header 'Authorization: Bearer <token>' \

--data '{
@@ -258,7 +258,7 @@ Response: <b>200 OK</b> 


Request:

```

curl --location --request DELETE 'http://localhost:8091/registry-api/package-registry/secret/registry.ubitech.eu/nsit/maestro-apps/cms-api' \

curl --location --request DELETE 'http://localhost:8091/registry-api/package-registry/secret/labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/cms-api' \

--header 'Authorization: Bearer <token>'

```

Response: <b>204 No Content</b>

pom.xml

+2 −3
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
       <groupId>org.etsi.osl.hypo.api</groupId>

        <artifactId>tmf.parent</artifactId>

        <version>0.1.0</version>

        <!-- Signify parent lookup from artifact repository -->

        <relativePath/>

    </parent>
@@ -29,7 +28,7 @@ 
    <distributionManagement>

       <repository>

        <id>gitlab-maven</id>

        <url>https://gitlab.ubitech.eu/api/v4/groups/maestro-v2/-/packages/maven</url>

        <url>https://labs.etsi.org/rep/api/v4/groups/1332/-/packages/maven</url>

        </repository>

        <snapshotRepository>

            <id>gitlab-maven</id>
@@ -44,7 +43,7 @@ 
        </repository>

        <repository>

            <id>gitlab-maven</id>

            <url>https://gitlab.ubitech.eu/api/v4/groups/maestro-v2/-/packages/maven</url>

            <url>https://labs.etsi.org/rep/api/v4/groups/1332/-/packages/maven</url>

        </repository>

    </repositories>

src/main/resources/application.properties

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ service.order.vault.secret-kv-path=hypo/service-order-data 


#quarkus.log.category."org.jboss.resteasy.reactive.client.logging".level=DEBUG



quarkus.kafka.devservices.image-name=registry.ubitech.eu/nsit/maestro-apps/vectorized/redpanda:v24.1.2

quarkus.kafka.devservices.image-name=labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/vectorized/redpanda:v24.1.2



#OpenAPI

mp.openapi.extensions.smallrye.info.title=ETSI HypO Registry API

src/test/java/org/etsi/osl/hypo/registry/rest/RegistryResourceTest.java

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ class RegistryResourceTest { 
    @ValueSource(

            strings = {

                "https://repo.iquadrat.com:8084/artifactory/helm-fidal-repo-v/",

                "oci://registry.ubitech.eu/nsit/maestro-apps/cms/"

                "oci://labs.etsi.org:5050/osl/hypo/code/org.etsi.osl.hypo.ops/cicd/integration.tests/cms/"

            })

    void testSanitization_Integration(String rawUrl) {

        RegistrySecret secret = createValidSecret();