Skip to content

Commit a0b0026

Browse files
authored
Merge pull request #252 from browserstack/update_dependencies
chore(deps): updating package versions
2 parents f5d1770 + 883e734 commit a0b0026

File tree

9 files changed

+1041
-1286
lines changed

9 files changed

+1041
-1286
lines changed

.github/workflows/docker-push.yml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,39 @@ name: Build and Push enigma image to Docker
22
on:
33
push:
44
tags:
5-
- 'v*'
5+
- v*
66

77
jobs:
88
build:
99
runs-on: ubuntu-latest
1010
steps:
11-
- name: Check out the repo
12-
uses: actions/checkout@v3
13-
- name: Set up QEMU
14-
uses: docker/setup-qemu-action@v2
15-
- name: Set up Docker Buildx
16-
uses: docker/setup-buildx-action@v2
17-
- name: Docker metadata
18-
id: meta
19-
uses: docker/metadata-action@v4
20-
with:
21-
images: |
22-
browserstack/enigma
23-
tags: |
24-
type=semver,pattern=v{{version}}
25-
type=semver,pattern=v{{major}}.{{minor}}
26-
type=semver,pattern=v{{major}}
27-
- name: Login to DockerHub
28-
uses: docker/login-action@v2
29-
with:
30-
username: ${{ secrets.DOCKERHUB_USERNAME }}
31-
password: ${{ secrets.DOCKERHUB_TOKEN }}
32-
- name: Build and push
33-
uses: docker/build-push-action@v4
34-
with:
35-
context: .
36-
push: true
37-
platforms: linux/amd64, linux/arm64/v8
38-
target: web
39-
tags: ${{ steps.meta.outputs.tags }}
40-
labels: ${{ steps.meta.outputs.labels }}
11+
- name: Check out the repo
12+
uses: actions/checkout@v3
13+
- name: Set up QEMU
14+
uses: docker/setup-qemu-action@v2
15+
- name: Set up Docker Buildx
16+
uses: docker/setup-buildx-action@v2
17+
- name: Docker metadata
18+
id: meta
19+
uses: docker/metadata-action@v4
20+
with:
21+
images: |
22+
browserstack/enigma
23+
tags: |
24+
type=semver,pattern=v{{version}}
25+
type=semver,pattern=v{{major}}.{{minor}}
26+
type=semver,pattern=v{{major}}
27+
- name: Login to DockerHub
28+
uses: docker/login-action@v2
29+
with:
30+
username: ${{ secrets.DOCKERHUB_USERNAME }}
31+
password: ${{ secrets.DOCKERHUB_TOKEN }}
32+
- name: Build and push
33+
uses: docker/build-push-action@v4
34+
with:
35+
context: .
36+
push: true
37+
platforms: linux/amd64, linux/arm64/v8
38+
target: web
39+
tags: ${{ steps.meta.outputs.tags }}
40+
labels: ${{ steps.meta.outputs.labels }}

.pre-commit-config.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# See https://pre-commit.com/hooks.html for more hooks
33
repos:
44
- repo: https://github.com/pre-commit/pre-commit-hooks
5-
rev: v4.4.0
5+
rev: v4.6.0
66
hooks:
77
- id: check-merge-conflict
88
- id: trailing-whitespace
@@ -19,11 +19,11 @@ repos:
1919
files: \.(json|json.sample)$
2020
args: [--autofix, --no-sort-keys]
2121
- repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
22-
rev: v2.6.0
22+
rev: v2.14.0
2323
hooks:
2424
- id: pretty-format-yaml
2525
args: [--autofix]
2626
- repo: https://github.com/alessandrojcm/commitlint-pre-commit-hook
27-
rev: v9.4.0
27+
rev: v9.16.0
2828
hooks:
2929
- id: commitlint

Access/tests/features/get_pending_request.feature

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Feature : Get Pending Request
2-
2+
33
Scenario: Retrieving All Pending Requests
44
Given request to view all pending requests
55
When the `get_pending_requests` method is called
@@ -13,4 +13,3 @@ Feature : Get Pending Request
1313
When the `get_pending_requests` method is called
1414
Then the method should handle the error
1515
And return an error response
16-
Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Feature: Get Request Access
2-
2+
33
Scenario: verify generic form key
44
Given empty configured access_modules are There
55
And get_request has zero modules
@@ -8,14 +8,14 @@ Feature: Get Request Access
88

99
Scenario: get_access_request returns correct response
1010
Given four configured access_modules are There
11-
And get_request has four modules
12-
When get_request_access function is called
11+
And get_request has four modules
12+
When get_request_access function is called
1313
Then Return value should return all four access list with all seven present keynames
14-
14+
1515
Scenario: get_access_request returns correct response with extra fields
1616
Given four configured access_modules are There
1717
And two with extra fields and two without extra fields
18-
When get_request_access function is called
18+
When get_request_access function is called
1919
Then Return value should return all four access with extra fields
2020

2121
Scenario: get_access_request returns correct response with notice/alert
@@ -26,30 +26,29 @@ Feature: Get Request Access
2626

2727
Scenario: verify response with array of access list with two elements
2828
Given four configured access_modules are There
29-
And get_request has two modules
29+
And get_request has two modules
3030
When get_request_access function is called
3131
Then Return value should be access list with two modules
3232

3333
Scenario: verify response with array of access list with empty elements
3434
Given four configured access_modules are There
35-
And get_request has zero modules
35+
And get_request has zero modules
3636
When get_request_access function is called
3737
Then Return value should be empty access list
3838

3939
Scenario: verify response with array of access list with all elements
4040
Given four configured access_modules are There
41-
And get_request has four modules
41+
And get_request has four modules
4242
When get_request_access function is called
4343
Then Return value should return all four access list with all seven present keynames
4444

4545
Scenario: get_request_access is called with invalid parameters
4646
Given four configured access_modules are There
47-
And get_request does not have accesses key
47+
And get_request does not have accesses key
4848
When get_request_access function is called
4949
Then Return value should be error json
5050

5151
Scenario: get_request_access is called with invalid request type
5252
Given request is post request
5353
When get_request_access function is called for invalid request type
5454
Then Return value should be error json
55-
Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
Feature: Validate Approver Permission
2-
2+
33
Scenario: User who made the request has primary approver access & access_mapping is not in pending state & module does not need secondary approval
44
Given User who made request has primary approver access
55
And access_mapping is not in pending state
66
And Modules does not need secondary approval
7-
When validate_approver_permissions function is called
7+
When validate_approver_permissions function is called
88
Then Return value should be empty json
99

10-
Scenario: _get_approver_permissions raises an Exception, the function should return error message as json
10+
Scenario: _get_approver_permissions raises an Exception, the function should return error message as json
1111
Given _get_approver_permissions raises an exception when called
1212
When validate_approver_permissions function is called
1313
Then Return value should be error json
@@ -18,40 +18,39 @@ Feature: Validate Approver Permission
1818
And Modules does not need secondary approval
1919
When validate_approver_permissions function is called
2020
Then Return value should be permission denied json
21-
21+
2222
Scenario: User who made the request has secondary approver access & access_mapping is not in pending state & module supports secondary approval
2323
Given User who made request has secondary approver access
2424
And access_mapping is not in pending state
2525
And Modules supports secondary approval
2626
When validate_approver_permissions function is called
2727
Then Return value should be empty json
2828

29-
Scenario: User who made the request has primary approver access & access_mapping is not in pending state & module supports secondary approval
29+
Scenario: User who made the request has primary approver access & access_mapping is not in pending state & module supports secondary approval
3030
Given User who made request has primary approver access with false response
3131
And access_mapping is not in pending state
3232
And Modules supports secondary approval
3333
When validate_approver_permissions function is called
3434
Then Return value should be permission denied json
3535

3636

37-
Scenario: When the user who made the request has primary approver access & access_mapping is in pending state & module does not need secondary approval
37+
Scenario: When the user who made the request has primary approver access & access_mapping is in pending state & module does not need secondary approval
3838
Given User who made request has primary approver access
3939
And access_mapping is in pending state
4040
And Modules does not need secondary approval
4141
When validate_approver_permissions function is called
4242
Then Return value should be empty json
4343

44-
Scenario: When the user who made the request has primary approver access & access_mapping is in pending state & module does needs secondary approval
44+
Scenario: When the user who made the request has primary approver access & access_mapping is in pending state & module does needs secondary approval
4545
Given User who made request has primary approver access
4646
And access_mapping is in pending state
4747
And Modules supports secondary approval
48-
When validate_approver_permissions function is called
48+
When validate_approver_permissions function is called
4949
Then Return value should be empty json
5050

51-
Scenario: When the user who made the request has secondary approver access & access_mapping is in primary pending state & module does needs secondary approval
51+
Scenario: When the user who made the request has secondary approver access & access_mapping is in primary pending state & module does needs secondary approval
5252
Given User who made request has only secondary approver access with false response
5353
And access_mapping is in pending state
5454
And Modules does not need secondary approval
55-
When validate_approver_permissions function is called
55+
When validate_approver_permissions function is called
5656
Then Return value should be permission denied json
57-

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Enigma access management tool was developed internally at BrowserStack to solve
4848
The following steps are for hosting Enigma locally from published docker container images.
4949

5050
For development setup, follow these docs:
51-
[Setup using docker](/docs/“How-to”%20guides/User%20Guides/Local%20Developer%20Setup/Local%20Setup%20with%20Docker.md),
51+
[Setup using docker](/docs/“How-to”%20guides/User%20Guides/Local%20Developer%20Setup/Local%20Setup%20with%20Docker.md),
5252
[Setup without docker](/docs/“How-to”%20guides/User%20Guides/Local%20Developer%20Setup/Local%20Setup%20without%20Docker.md)
5353

5454
#### Pre-requisites
@@ -84,7 +84,7 @@ For first time user sign-in, follow [this doc](/docs/%E2%80%9CHow-to%E2%80%9D%20
8484
- The codebase is tested for Python 3.11.0
8585
- Setup pre-commit hooks for development (see rules [below](#rules-enforced-by-the-pre-commit-hooks))
8686
- run: `npm install @commitlint/cli @commitlint/config-conventional`
87-
- run: `pip install pre-commit==2.21.0`
87+
- run: `pip install pre-commit==3.8.0`
8888
- run: `pre-commit install --install-hooks --overwrite` in the base directory of this project
8989
- run: `pre-commit autoupdate`
9090
- run: `pre-commit run --all-files --show-diff-on-failure --color always`

0 commit comments

Comments
 (0)