conjur-api 6.0.0.pre.94 → 6.0.0.pre.133
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +4 -0
- data/Jenkinsfile +25 -17
- data/VERSION +1 -1
- data/docker-compose.yml +1 -1
- data/features/members.feature +7 -0
- data/lib/conjur/acts_as_role.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: c2f3cc935ccbfe585599623d3a1e0caf03b22c909ddb927041428ff407a1296a
|
|
4
|
+
data.tar.gz: 8672f5d64b4fa21197d17d363d005c4141b49c01ceaa0162b8236250cef108f3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 1683b29276339ecd25e8545f42e24de5a2cc536c0a4be16e321610544e8b283ae1112f7bd81d2304f359cd60df6b54df7d26af72656de342712bade1eff41003
|
|
7
|
+
data.tar.gz: 3822b8032c1f06e941f0754b5949ba20cf98d55983386fbad7cfbaf6a26dd924b9c725378ce27fe93b915f3e1b1751f1d2c6e17bddf82fc55787d8f5c1310232
|
data/CHANGELOG.md
CHANGED
|
@@ -14,6 +14,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
|
|
|
14
14
|
### Removed
|
|
15
15
|
- Remove support for Conjur V4 (CNJR-2935)
|
|
16
16
|
|
|
17
|
+
### Fixed
|
|
18
|
+
- Pass valid field in #memberships to fix listing roles (CNJR-2109)
|
|
19
|
+
- Pull keycloak image from internal repository
|
|
20
|
+
|
|
17
21
|
## [5.4.1] - 2023-06-14
|
|
18
22
|
|
|
19
23
|
### Added
|
data/Jenkinsfile
CHANGED
|
@@ -8,8 +8,8 @@ properties([
|
|
|
8
8
|
])
|
|
9
9
|
|
|
10
10
|
if (params.MODE == "PROMOTE") {
|
|
11
|
-
release.promote(params.VERSION_TO_PROMOTE) { sourceVersion, targetVersion, assetDirectory ->
|
|
12
|
-
|
|
11
|
+
release.promote(params.VERSION_TO_PROMOTE) { infrapool, sourceVersion, targetVersion, assetDirectory ->
|
|
12
|
+
infrapool.agentSh './publish.sh'
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
// Copy Github Enterprise release to Github
|
|
@@ -48,25 +48,33 @@ pipeline {
|
|
|
48
48
|
}
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
+
stage('Scan for internal URLs') {
|
|
52
|
+
steps {
|
|
53
|
+
script {
|
|
54
|
+
detectInternalUrls()
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
|
|
51
59
|
stage('Get InfraPool Agent') {
|
|
52
60
|
steps {
|
|
53
61
|
script {
|
|
54
|
-
|
|
62
|
+
infrapool = getInfraPoolAgent.connected(type: "ExecutorV2", quantity: 1, duration: 1)[0]
|
|
55
63
|
}
|
|
56
64
|
}
|
|
57
65
|
}
|
|
58
66
|
|
|
59
67
|
stage('Validate Changelog and set version') {
|
|
60
68
|
steps {
|
|
61
|
-
parseChangelog(
|
|
62
|
-
updateVersion(
|
|
69
|
+
parseChangelog(infrapool)
|
|
70
|
+
updateVersion(infrapool, "CHANGELOG.md", "${BUILD_NUMBER}")
|
|
63
71
|
}
|
|
64
72
|
}
|
|
65
73
|
|
|
66
74
|
stage('Prepare CC Report Dir'){
|
|
67
75
|
steps {
|
|
68
76
|
script {
|
|
69
|
-
|
|
77
|
+
infrapool.agentSh 'mkdir -p coverage'
|
|
70
78
|
}
|
|
71
79
|
}
|
|
72
80
|
}
|
|
@@ -77,8 +85,8 @@ pipeline {
|
|
|
77
85
|
}
|
|
78
86
|
steps {
|
|
79
87
|
script {
|
|
80
|
-
|
|
81
|
-
|
|
88
|
+
infrapool.agentSh "./test.sh"
|
|
89
|
+
infrapool.agentStash name: 'reports3.0', includes: '**/reports/*.xml'
|
|
82
90
|
}
|
|
83
91
|
}
|
|
84
92
|
post {
|
|
@@ -94,8 +102,8 @@ pipeline {
|
|
|
94
102
|
}
|
|
95
103
|
steps {
|
|
96
104
|
script {
|
|
97
|
-
|
|
98
|
-
|
|
105
|
+
infrapool.agentSh "./test.sh"
|
|
106
|
+
infrapool.agentStash name: 'reports3.1', includes: '**/reports/*.xml'
|
|
99
107
|
}
|
|
100
108
|
}
|
|
101
109
|
post {
|
|
@@ -111,8 +119,8 @@ pipeline {
|
|
|
111
119
|
}
|
|
112
120
|
steps {
|
|
113
121
|
script {
|
|
114
|
-
|
|
115
|
-
|
|
122
|
+
infrapool.agentSh "./test.sh"
|
|
123
|
+
infrapool.agentStash name: 'reports3.2', includes: '**/reports/*.xml'
|
|
116
124
|
}
|
|
117
125
|
}
|
|
118
126
|
post {
|
|
@@ -125,7 +133,7 @@ pipeline {
|
|
|
125
133
|
stage('Submit Coverage Report'){
|
|
126
134
|
steps{
|
|
127
135
|
script {
|
|
128
|
-
|
|
136
|
+
infrapool.agentStash name: 'coverage', includes: '**/coverage/**'
|
|
129
137
|
}
|
|
130
138
|
unstash 'coverage'
|
|
131
139
|
|
|
@@ -166,16 +174,16 @@ pipeline {
|
|
|
166
174
|
|
|
167
175
|
steps {
|
|
168
176
|
script {
|
|
169
|
-
release(
|
|
177
|
+
release(infrapool) {
|
|
170
178
|
// Clean up all but the calculated VERSION
|
|
171
|
-
|
|
179
|
+
infrapool.agentSh '''docker run -i --rm -v $(pwd):/src -w /src --entrypoint /bin/sh alpine/git \
|
|
172
180
|
-c "git config --global --add safe.directory /src && \
|
|
173
181
|
git clean -fdx \
|
|
174
182
|
-e VERSION \
|
|
175
183
|
-e bom-assets/ \
|
|
176
184
|
-e release-assets" '''
|
|
177
|
-
|
|
178
|
-
|
|
185
|
+
infrapool.agentSh './publish.sh'
|
|
186
|
+
infrapool.agentSh 'cp conjur-api-*.gem release-assets/.'
|
|
179
187
|
}
|
|
180
188
|
}
|
|
181
189
|
}
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
6.0.0-
|
|
1
|
+
6.0.0-133
|
data/docker-compose.yml
CHANGED
data/features/members.feature
CHANGED
|
@@ -49,3 +49,10 @@ Feature: Display role members and memberships.
|
|
|
49
49
|
}
|
|
50
50
|
]
|
|
51
51
|
"""
|
|
52
|
+
|
|
53
|
+
Scenario: Show a role's memberships non-recursive.
|
|
54
|
+
When I run the code:
|
|
55
|
+
"""
|
|
56
|
+
$conjur.role('cucumber:group:developers').memberships(recursive: false).any?
|
|
57
|
+
"""
|
|
58
|
+
Then the result should be "true"
|
data/lib/conjur/acts_as_role.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: conjur-api
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 6.0.0.pre.
|
|
4
|
+
version: 6.0.0.pre.133
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- CyberArk Maintainers
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2024-
|
|
11
|
+
date: 2024-04-04 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rest-client
|