Merge branch 'release/0.17.0'

Author: nshumoogum

ci/build.yml

@@ -6,7 +6,7 @@ image_resource:
   type: docker-image
   source:
     repository: golang
-    tag: 1.17.1
+    tag: 1.18.6
 
 inputs:
   - name: dp-permissions-api

ci/component.yml

@@ -6,7 +6,7 @@ image_resource:
   type: docker-image
   source:
     repository: golang
-    tag: 1.17.1
+    tag: 1.18.6
 
 inputs:
   - name: dp-permissions-api

ci/lint.yml

@@ -6,7 +6,7 @@ image_resource:
   type: docker-image
   source:
     repository: golang
-    tag: latest
+    tag: 1.18.6
 
 inputs:
   - name: dp-permissions-api

features/steps/permissions_component.go

@@ -58,52 +58,52 @@ func getPermissionsBundle() *permissions.Bundle {
 		models.PoliciesCreate: { // role
 			"groups/role-admin": { // groups
 				permissions.Policy{
-					ID:         "policy1",
-					Conditions: nil,
+					ID:        "policy1",
+					Condition: permissions.Condition{},
 				},
 			},
 		},
 		models.PoliciesRead: { // role
 			"groups/role-admin": { // groups
 				permissions.Policy{
-					ID:         "policy1",
-					Conditions: nil,
+					ID:        "policy1",
+					Condition: permissions.Condition{},
 				},
 			},
 			"groups/role-publisher": { // groups
 				permissions.Policy{
-					ID:         "policy2",
-					Conditions: nil,
+					ID:        "policy2",
+					Condition: permissions.Condition{},
 				},
 			},
 			"groups/role-viewer": { // groups
 				permissions.Policy{
-					ID:         "policy2",
-					Conditions: nil,
+					ID:        "policy2",
+					Condition: permissions.Condition{},
 				},
 			},
 		},
 		models.PoliciesUpdate: { // role
 			"groups/role-admin": { // groups
 				permissions.Policy{
-					ID:         "policy3",
-					Conditions: nil,
+					ID:        "policy3",
+					Condition: permissions.Condition{},
 				},
 			},
 		},
 		models.PoliciesDelete: { // role
 			"groups/role-admin": { // groups
 				permissions.Policy{
-					ID:         "policy1",
-					Conditions: nil,
+					ID:        "policy1",
+					Condition: permissions.Condition{},
 				},
 			},
 		},
 		models.RolesRead: { // role
 			"groups/role-admin": { // groups
 				permissions.Policy{
-					ID:         "policy1",
-					Conditions: nil,
+					ID:        "policy1",
+					Condition: permissions.Condition{},
 				},
 			},
 		},

go.mod

@@ -1,16 +1,16 @@
 module github.com/ONSdigital/dp-permissions-api
 
-go 1.17
+go 1.18
 
 replace github.com/spf13/cobra => github.com/spf13/cobra v1.4.0
 
 require (
-	github.com/ONSdigital/dp-authorisation/v2 v2.22.0
+	github.com/ONSdigital/dp-authorisation/v2 v2.25.1
 	github.com/ONSdigital/dp-component-test v0.7.0
-	github.com/ONSdigital/dp-healthcheck v1.4.0-beta
-	github.com/ONSdigital/dp-mongodb/v3 v3.0.2
+	github.com/ONSdigital/dp-healthcheck v1.3.0
+	github.com/ONSdigital/dp-mongodb/v3 v3.3.0
 	github.com/ONSdigital/dp-net v1.4.1
-	github.com/ONSdigital/log.go/v2 v2.3.0-beta
+	github.com/ONSdigital/log.go/v2 v2.2.0
 	github.com/cucumber/godog v0.12.2
 	github.com/gofrs/uuid v4.2.0+incompatible
 	github.com/gorilla/mux v1.8.0
@@ -22,12 +22,12 @@ require (
 
 require (
 	github.com/ONSdigital/dp-api-clients-go v1.43.0 // indirect
-	github.com/ONSdigital/dp-api-clients-go/v2 v2.153.0 // indirect
+	github.com/ONSdigital/dp-api-clients-go/v2 v2.159.1 // indirect
 	github.com/ONSdigital/dp-mongodb-in-memory v1.3.1 // indirect
-	github.com/ONSdigital/dp-net/v2 v2.5.0-beta // indirect
+	github.com/ONSdigital/dp-net/v2 v2.4.0 // indirect
 	github.com/ONSdigital/dp-rchttp v1.0.0 // indirect
 	github.com/ONSdigital/go-ns v0.0.0-20210916104633-ac1c1c52327e // indirect
-	github.com/aws/aws-sdk-go v1.44.52 // indirect
+	github.com/aws/aws-sdk-go v1.44.75 // indirect
 	github.com/chromedp/cdproto v0.0.0-20211126220118-81fa0469ad77 // indirect
 	github.com/chromedp/chromedp v0.7.6 // indirect
 	github.com/chromedp/sysutil v1.0.0 // indirect
@@ -57,7 +57,6 @@ require (
 	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/maxcnunes/httpfake v1.2.4 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/rogpeppe/go-internal v1.8.1 // indirect
 	github.com/smartystreets/assertions v1.13.0 // indirect
 	github.com/spf13/afero v1.8.2 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
@@ -68,9 +67,9 @@ require (
 	github.com/xdg-go/stringprep v1.0.3 // indirect
 	github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect
 	golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e // indirect
-	golang.org/x/net v0.0.0-20220708220712-1185a9018129 // indirect
+	golang.org/x/net v0.0.0-20220811182439-13a9a731de15 // indirect
 	golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
-	golang.org/x/sys v0.0.0-20220712014510-0a85c31ab51e // indirect
+	golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
 	golang.org/x/text v0.3.7 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )