conjur-api 6.0.0.pre.94 → 6.0.0.pre.133

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12ce978d5cb26691a74513c1197065c11a7bab6281149288232cffc223402656
-  data.tar.gz: 88439b9a02e9e2e21061c3cc6af56af8cd7a67a576e16702ba3df59dda638879
+  metadata.gz: c2f3cc935ccbfe585599623d3a1e0caf03b22c909ddb927041428ff407a1296a
+  data.tar.gz: 8672f5d64b4fa21197d17d363d005c4141b49c01ceaa0162b8236250cef108f3
 SHA512:
-  metadata.gz: 25319c2ecf51a6b6a7e10051d0c8140b14f71ef41a5d1183b4c9e768194a2137c2e5b5691beeebb85b11bae85b96f9813895d20846e9dc92705322844cd5aab5
-  data.tar.gz: 38307b2e705826bb924404654f62a9aed257011664c8712d638fa271c3791305e20f5abf7ebaa879152d996631e1244eaa0438777ca18a68c89d6cf494aa16ac
+  metadata.gz: 1683b29276339ecd25e8545f42e24de5a2cc536c0a4be16e321610544e8b283ae1112f7bd81d2304f359cd60df6b54df7d26af72656de342712bade1eff41003
+  data.tar.gz: 3822b8032c1f06e941f0754b5949ba20cf98d55983386fbad7cfbaf6a26dd924b9c725378ce27fe93b915f3e1b1751f1d2c6e17bddf82fc55787d8f5c1310232

data/CHANGELOG.md

@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ### Removed
 - Remove support for Conjur V4 (CNJR-2935)
 
+### Fixed
+- Pass valid field in #memberships to fix listing roles (CNJR-2109)
+- Pull keycloak image from internal repository
+
 ## [5.4.1] - 2023-06-14
 
 ### Added

data/Jenkinsfile

@@ -8,8 +8,8 @@ properties([
 ])
 
 if (params.MODE == "PROMOTE") {
-  release.promote(params.VERSION_TO_PROMOTE) { sourceVersion, targetVersion, assetDirectory ->
-    sh './publish.sh'
+  release.promote(params.VERSION_TO_PROMOTE) { infrapool, sourceVersion, targetVersion, assetDirectory ->
+    infrapool.agentSh './publish.sh'
   }
 
   // Copy Github Enterprise release to Github
@@ -48,25 +48,33 @@ pipeline {
       }
     }
 
+    stage('Scan for internal URLs') {
+      steps {
+        script {
+          detectInternalUrls()
+        }
+      }
+    }
+
     stage('Get InfraPool Agent') {
       steps {
         script {
-          INFRAPOOL_EXECUTORV2_AGENT_0 = getInfraPoolAgent.connected(type: "ExecutorV2", quantity: 1, duration: 1)[0]
+          infrapool = getInfraPoolAgent.connected(type: "ExecutorV2", quantity: 1, duration: 1)[0]
         }
       }
     }
 
     stage('Validate Changelog and set version') {
       steps {
-        parseChangelog(INFRAPOOL_EXECUTORV2_AGENT_0)
-        updateVersion(INFRAPOOL_EXECUTORV2_AGENT_0, "CHANGELOG.md", "${BUILD_NUMBER}")
+        parseChangelog(infrapool)
+        updateVersion(infrapool, "CHANGELOG.md", "${BUILD_NUMBER}")
       }
     }
 
     stage('Prepare CC Report Dir'){
       steps {
         script {
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentSh 'mkdir -p coverage'
+          infrapool.agentSh 'mkdir -p coverage'
         }
       }
     }
@@ -77,8 +85,8 @@ pipeline {
       }
       steps {
         script {
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentSh "./test.sh"
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentStash name: 'reports3.0', includes: '**/reports/*.xml'
+          infrapool.agentSh "./test.sh"
+          infrapool.agentStash name: 'reports3.0', includes: '**/reports/*.xml'
         }
       }
       post {
@@ -94,8 +102,8 @@ pipeline {
       }
       steps {
         script {
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentSh "./test.sh"
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentStash name: 'reports3.1', includes: '**/reports/*.xml'
+          infrapool.agentSh "./test.sh"
+          infrapool.agentStash name: 'reports3.1', includes: '**/reports/*.xml'
         }
       }
       post {
@@ -111,8 +119,8 @@ pipeline {
       }
       steps {
         script {
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentSh "./test.sh"
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentStash name: 'reports3.2', includes: '**/reports/*.xml'
+          infrapool.agentSh "./test.sh"
+          infrapool.agentStash name: 'reports3.2', includes: '**/reports/*.xml'
         }
       }
       post {
@@ -125,7 +133,7 @@ pipeline {
     stage('Submit Coverage Report'){
       steps{
         script {
-          INFRAPOOL_EXECUTORV2_AGENT_0.agentStash name: 'coverage', includes: '**/coverage/**'
+          infrapool.agentStash name: 'coverage', includes: '**/coverage/**'
         }
         unstash 'coverage'
 
@@ -166,16 +174,16 @@ pipeline {
 
       steps {
         script {
-          release(INFRAPOOL_EXECUTORV2_AGENT_0) {
+          release(infrapool) {
             // Clean up all but the calculated VERSION
-            INFRAPOOL_EXECUTORV2_AGENT_0.agentSh '''docker run -i --rm -v $(pwd):/src -w /src --entrypoint /bin/sh alpine/git \
+            infrapool.agentSh '''docker run -i --rm -v $(pwd):/src -w /src --entrypoint /bin/sh alpine/git \
                   -c "git config --global --add safe.directory /src && \
                       git clean -fdx \
                         -e VERSION \
                         -e bom-assets/ \
                         -e release-assets" '''
-            INFRAPOOL_EXECUTORV2_AGENT_0.agentSh './publish.sh'
-            INFRAPOOL_EXECUTORV2_AGENT_0.agentSh 'cp conjur-api-*.gem release-assets/.'
+            infrapool.agentSh './publish.sh'
+            infrapool.agentSh 'cp conjur-api-*.gem release-assets/.'
           }
         }
       }

data/VERSION

@@ -1 +1 @@
-6.0.0-94
+6.0.0-133

data/docker-compose.yml

@@ -20,7 +20,7 @@ services:
       - keycloak
 
   keycloak:
-    image: jboss/keycloak:4.3.0.Final
+    image: registry.tld/jboss/keycloak:4.3.0.Final
     environment:
       - KEYCLOAK_USER=admin
       - KEYCLOAK_PASSWORD=admin

data/features/members.feature

@@ -49,3 +49,10 @@ Feature: Display role members and memberships.
       }
     ]
     """
+
+  Scenario: Show a role's memberships non-recursive.
+    When I run the code:
+    """
+    $conjur.role('cucumber:group:developers').memberships(recursive: false).any?
+    """
+    Then the result should be "true"

data/lib/conjur/acts_as_role.rb

@@ -108,7 +108,7 @@ module Conjur
           if item.is_a?(String)
             build_object(item, default_class: Role)
           else
-            RoleGrant.parse_from_json(item, self.options)
+            RoleGrant.parse_from_json(item, self.credentials)
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: conjur-api
 version: !ruby/object:Gem::Version
-  version: 6.0.0.pre.94
+  version: 6.0.0.pre.133
 platform: ruby
 authors:
 - CyberArk Maintainers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-16 00:00:00.000000000 Z
+date: 2024-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client