Merge pull request #70 from datadrivers/release/v1.9.0

Release v1.9.0
datadrivers · Jul 6, 2020 · 313ad8a · 313ad8a
2 parents 1dc8899 + 92e99fb
commit 313ad8a
Show file tree

Hide file tree

Showing 15 changed files with 1,020 additions and 49 deletions.
diff --git a/README.md b/README.md
@@ -7,6 +7,8 @@
     - [nexus_blobstore](#data-nexus_blobstore)
     - [nexus_privileges](#data-nexus_privileges)
     - [nexus_repository](#data-nexus_repository)
+    - [nexus_security_ldap](#data-nexus_security_ldap)
+    - [nexus_security_realms](#data-nexus_security_realms)
     - [nexus_user](#data-nexus_user)
   - [Resources](#resources)
     - [nexus_blobstore](#resource-nexus_blobstore)
@@ -16,8 +18,10 @@
     - [nexus_privilege](#resource-nexus_privilege)
     - [nexus_repository](#resource-nexus_repository)
     - [nexus_role](#resource-nexus_role)
-    - [nexus_user](#resource-nexus_user)
+    - [nexus_security_ldap](#resource-nexus_security_ldap)
+    - [nexus_security_realms](#resource-nexus_security_realms)
     - [nexus_script](#resource-nexus_script)
+    - [nexus_user](#resource-nexus_user)
 - [Build](#build)
 - [Testing](#testing)
 - [Author](#author)
@@ -73,6 +77,22 @@ data "nexus_repository" "maven-central" {
 }
 ```
 
+#### Data nexus_security_ldap
+
+Return LDAP server
+
+```hcl
+data "nexus_security_ldap" "example" {}
+```
+
+#### Data nexus_security_realms
+
+Return active and available security realms
+
+```hcl
+data "nexus_security_realms" "example" {}
+```
+
 #### Data nexus_user
 
 ```hcl
@@ -488,23 +508,58 @@ resource "nexus_role" "nx-admin" {
 }
 ```
 
-#### Resource nexus_user
+#### Resource nexus_security_ldap
 
-User can be imported using
+Configure LDAP server
 
 ```shell
-terraform import nexus_user.admin admin
+terraform import nexus_security_ldap.example example
 ```
 
 ```hcl
-resource "nexus_user" "admin" {
-  userid    = "admin"
-  firstname = "Administrator"
-  lastname  = "User"
-  email     = "nexus@example.com"
-  password  = "admin123"
-  roles     = ["nx-admin"]
-  status    = "active"
+resource "nexus_security_ldap" "acceptance" {
+  auth_password                  = "t0ps3cr3t"
+  auth_realm                     = "EXAMPLE"
+  auth_schema                    = ""
+  auth_username                  = "admin"
+  connection_retry_delay_seconds = 1
+  connection_timeout_seconds     = 1
+  group_base_dn                  = "ou=Group"
+  group_id_attribute             = "cn"
+  group_member_attribute         = "memberUid"
+  group_member_format            = "uid=${username},ou=people,dc=example,dc=com"
+  group_object_class             = "example"
+  group_subtree                  = true
+  host                           = "ldap.example.com"
+  ldap_groups_as_roles           = true
+  max_incident_count             = 1
+  name                           = "example-ldap"
+  port                           = 389
+  protocol                       = "LDAP"
+  search_base                    = "dc=example,dc=com"
+  user_base_dn                   = "ou=people"
+  user_email_address_attribute   = "mail"
+  user_id_attribute              = "uid"
+  user_ldap_filter               = "(|(mail=*@example.com)(uid=dom*))"
+  user_member_of_attribute       = "memberOf"
+  user_object_class              = "posixGroup"
+  user_password_attribute        = "exmaple"
+  user_real_name_attribute       = "cn"
+  user_subtree                   = true
+}
+```
+
+#### Resource nexus_security_realms
+
+Activate security realms
+
+```shell
+terraform import nexus_security_realms.example
+```
+
+```hcl
+resource "nexus_security_realms" "example" {
+  active = ["NexusAuthenticatingRealm", "NexusAuthorizingRealm"]
 }
 ```
 
@@ -523,6 +578,26 @@ resource "nexus_script" "hello_world" {
 }
 ```
 
+#### Resource nexus_user
+
+User can be imported using
+
+```shell
+terraform import nexus_user.admin admin
+```
+
+```hcl
+resource "nexus_user" "admin" {
+  userid    = "admin"
+  firstname = "Administrator"
+  lastname  = "User"
+  email     = "nexus@example.com"
+  password  = "admin123"
+  roles     = ["nx-admin"]
+  status    = "active"
+}
+```
+
 ## Build
 
 There is a [makefile](./GNUmakefile) to build the provider.

diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/datadrivers/terraform-provider-nexus
 go 1.14
 
 require (
-	github.com/datadrivers/go-nexus-client v0.12.1
-	github.com/hashicorp/terraform-plugin-sdk v1.13.0
+	github.com/datadrivers/go-nexus-client v0.14.3
+	github.com/hashicorp/terraform-plugin-sdk v1.14.0
 	github.com/stretchr/testify v1.5.1
 )
diff --git a/go.sum b/go.sum
@@ -34,8 +34,8 @@ github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kB
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cheggaaa/pb v1.0.27/go.mod h1:pQciLPpbU0oxA0h+VJYYLxO+XeDQb5pZijXscXHm81s=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
-github.com/datadrivers/go-nexus-client v0.12.0 h1:t188WnPQcr8nxnL8RUYgNG66OagCg6n4BQsBz4/MDhs=
-github.com/datadrivers/go-nexus-client v0.12.0/go.mod h1:YWiZvmtfQMDiOOHckMJa60gcYS9Kmj5MXo37yiV3SZE=
+github.com/datadrivers/go-nexus-client v0.14.3 h1:xkz4Sl3WG3vsPRO7mOJTWGSJY9gpca59FkMHW1JM1PI=
+github.com/datadrivers/go-nexus-client v0.14.3/go.mod h1:bN9cSUGOSYdMSiLypohV+Uq3JKpW/gCkRlkk1jFJJ+s=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -65,6 +65,8 @@ github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5a
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1 h1:Xye71clBPdm5HgqGwUkwhbynsUJZhDbS20FvLhQ2izg=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk=
+github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/martian v2.1.0+incompatible h1:/CP5g8u/VJHijgedC/Legn3BAbAaWPgecwXBIDzw5no=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
 github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc=
@@ -86,8 +88,8 @@ github.com/hashicorp/go-hclog v0.9.2 h1:CG6TE5H9/JXsFWJCfoIVpKFIkFe6ysEuHirp4DxC
 github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
 github.com/hashicorp/go-multierror v1.0.0 h1:iVjPR7a6H0tWELX5NxNe7bYopibicUzc7uPribsnS6o=
 github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
-github.com/hashicorp/go-plugin v1.0.1 h1:4OtAfUGbnKC6yS48p0CtMX2oFYtzFZVv6rok3cRWgnE=
-github.com/hashicorp/go-plugin v1.0.1/go.mod h1:++UyYGoz3o5w9ZzAdZxtQKrWWP+iqPBn3cQptSMzBuY=
+github.com/hashicorp/go-plugin v1.2.0 h1:CUfYokW0EJNDcGecVrHZK//Cp1GFlHwoqtcUIEiU6BY=
+github.com/hashicorp/go-plugin v1.2.0/go.mod h1:F9eH4LrE/ZsRdbwhfjs9k9HoDUwAHnYtXdgmf1AVNs0=
 github.com/hashicorp/go-safetemp v1.0.0 h1:2HR189eFNrjHQyENnQMMpCiBAsRxzbTMIgBhEyExpmo=
 github.com/hashicorp/go-safetemp v1.0.0/go.mod h1:oaerMy3BhqiTbVye6QuFhFtIceqFoDHxNAB65b+Rj1I=
 github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE=
@@ -108,15 +110,17 @@ github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8
 github.com/hashicorp/terraform-config-inspect v0.0.0-20191115094559-17f92b0546e8/go.mod h1:p+ivJws3dpqbp1iP84+npOyAmTTOLMgCzrXd3GSdn/A=
 github.com/hashicorp/terraform-json v0.4.0 h1:KNh29iNxozP5adfUFBJ4/fWd0Cu3taGgjHB38JYqOF4=
 github.com/hashicorp/terraform-json v0.4.0/go.mod h1:eAbqb4w0pSlRmdvl8fOyHAi/+8jnkVYN28gJkSJrLhU=
-github.com/hashicorp/terraform-plugin-sdk v1.13.0 h1:8v2/ZNiI12OHxEn8pzJ3noCHyRc0biKbKj+iFv5ZWKw=
-github.com/hashicorp/terraform-plugin-sdk v1.13.0/go.mod h1:HiWIPD/T9HixIhQUwaSoDQxo4BLFdmiBi/Qz5gjB8Q0=
+github.com/hashicorp/terraform-plugin-sdk v1.14.0 h1:sUKcw7OHqDXhBarlHjv+/yMCr8eEb1lO8CGQ3pEEFiE=
+github.com/hashicorp/terraform-plugin-sdk v1.14.0/go.mod h1:t62Xy+m7Zjq5tA2vrs8Wuo/TQ0sc9Mx9MjXL3+7MHBQ=
 github.com/hashicorp/terraform-plugin-test v1.3.0 h1:hU5LoxrOn9qvOo+LTKN6mSav2J+dAMprbdxJPEQvp4U=
 github.com/hashicorp/terraform-plugin-test v1.3.0/go.mod h1:QIJHYz8j+xJtdtLrFTlzQVC0ocr3rf/OjIpgZLK56Hs=
 github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596 h1:hjyO2JsNZUKT1ym+FAdlBEkGPevazYsmVgIMw7dVELg=
 github.com/hashicorp/terraform-svchost v0.0.0-20191011084731-65d371908596/go.mod h1:kNDNcF7sN4DocDLBkQYz73HGKwN1ANB1blq4lIYLYvg=
 github.com/hashicorp/yamux v0.0.0-20180604194846-3520598351bb/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d h1:kJCB4vdITiW1eC1vq2e6IsrXKrZit1bv/TDYFGMp4BQ=
 github.com/hashicorp/yamux v0.0.0-20181012175058-2f1d1f20f75d/go.mod h1:+NfK9FKeTrX5uv1uIXGdwYDTeHna2qgaIlx54MXqjAM=
+github.com/jhump/protoreflect v1.6.0 h1:h5jfMVslIg6l29nsMs0D8Wj17RDVdNYti0vDN/PZZoE=
+github.com/jhump/protoreflect v1.6.0/go.mod h1:eaTn3RZAmMBcV0fifFvlm6VHNz3wSkYyXYWUh7ymB74=
 github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af h1:pmfjZENx5imkbgOkpRUYLnmbU7UEFbjtDA2hxJ1ichM=
 github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k=
@@ -207,6 +211,7 @@ golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTk
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
+golang.org/x/net v0.0.0-20180530234432-1e491301e022/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180811021610-c39426892332/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -232,7 +237,6 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20190129075346-302c3dd5f1cc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -271,6 +275,7 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1 h1:QzqyMA1tlu6CgqCDUtU9V+ZKhLFT2dkJuANu5QaxI3I=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
+google.golang.org/genproto v0.0.0-20170818010345-ee236bd376b0/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
@@ -280,7 +285,7 @@ google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a h1:lRlI5zu6AFy3iU/F8YWyNrAmn/tPCnhiTxfwhWb76eU=
 google.golang.org/genproto v0.0.0-20200310143817-43be25429f5a/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
-google.golang.org/grpc v1.14.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
+google.golang.org/grpc v1.8.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=

diff --git a/nexus/data_source_privileges.go b/nexus/data_source_privileges.go
@@ -2,7 +2,6 @@ package nexus
 
 import (
 	"fmt"
-	"log"
 
 	nexus "github.com/datadrivers/go-nexus-client"
 	"github.com/hashicorp/terraform-plugin-sdk/helper/schema"
@@ -143,8 +142,6 @@ func filterPrivileges(privileges []nexus.Privilege, filterDomain, filterFormat,
 	repositories := make([]int, 0)
 	types := make([]int, 0)
 
-	log.Printf("Found %d privs", len(privileges))
-
 	// Filter
 	// Golang OR operator precedence is left to right
 	// https://www.tutorialspoint.com/go/go_operators_precedence.htm
@@ -176,7 +173,7 @@ func filterPrivileges(privileges []nexus.Privilege, filterDomain, filterFormat,
 	for i, v := range intSlice {
 		result[i] = privileges[v]
 	}
-	log.Println(result)
+
 	return result, nil
 }