Fix create resource jenkins_authorization_global_matrix

ringanta · Jan 5, 2021 · c93f7c7 · c93f7c7
1 parent c7dd94d
commit c93f7c7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/Makefile b/Makefile
@@ -3,7 +3,7 @@ HOSTNAME=ringanta.id
 NAMESPACE=ringanta
 NAME=jenkins
 BINARY=terraform-provider-${NAME}
-VERSION=0.2
+VERSION=0.2.1
 OS_ARCH=darwin_amd64
 export COMPOSE_FILE=./docker_compose/docker-compose.yml
 

diff --git a/examples/main.tf b/examples/main.tf
@@ -15,7 +15,9 @@ resource "jenkins_authorization_global_matrix" "test" {
     "Overall/Read",
     "Job/Build",
     "Job/Cancel",
-    "Job/Read"
+    "Job/Read",
+    "Run/Update",
+    "Run/Delete"
   ]
 }
 

diff --git a/examples/providers.tf b/examples/providers.tf
@@ -4,7 +4,7 @@ terraform {
   required_providers {
     jenkins = {
       source  = "ringanta.id/ringanta/jenkins"
-      version = "~> 0.1.0"
+      version = "0.2.1"
     }
   }
 }

diff --git a/jenkins/commands.go b/jenkins/commands.go
@@ -135,10 +135,12 @@ def permissionIds = Permission.all.findAll { permission ->
 def strategy = Jenkins.instance.getAuthorizationStrategy()
 def result = [error: false, msg: '', data: [:]]
 def user_permissions = [{{range .Permissions}}'{{.}}',{{end}}]
+user_permissions.removeAll([null])
 
 user_permissions.collect {
 	strategy.add(permissionIds[it], '{{ .Username }}')
 }
+
 Jenkins.instance.save()
 result['msg'] = 'Permissions for user {{ .Username }} is created'