Merge branch 'master' of github.com:BESTSELLER/terraform-provider-har…

…bor into harbor_2.2_updates
goharbor · Mar 2, 2021 · 2b3e8ef · 2b3e8ef
2 parents ab1717d + 8531be1
commit 2b3e8ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -2,4 +2,4 @@ module github.com/BESTSELLER/terraform-provider-harbor
 
 go 1.14
 
-require github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3
+require github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.4
diff --git a/go.sum b/go.sum
@@ -198,8 +198,8 @@ github.com/hashicorp/terraform-json v0.8.0 h1:XObQ3PgqU52YLQKEaJ08QtUshAfN3yu4u8
 github.com/hashicorp/terraform-json v0.8.0/go.mod h1:3defM4kkMfttwiE7VakJDwCd4R+umhSQnvJwORXbprE=
 github.com/hashicorp/terraform-plugin-go v0.2.1 h1:EW/R8bB2Zbkjmugzsy1d27yS8/0454b3MtYHkzOknqA=
 github.com/hashicorp/terraform-plugin-go v0.2.1/go.mod h1:10V6F3taeDWVAoLlkmArKttR3IULlRWFAGtQIQTIDr4=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3 h1:DGnxpIYRHXQZb2TOlQ1OCEYxoRQrAcbLIcYm8kvbFuU=
-github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3/go.mod h1:5wrrTcxbSaQXamCDbHZTHk6yTF9OEZaOvQ9fvLXBE3o=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.4 h1:6k0WcxFgVqF/GUFHPvAH8FIrCkoA1RInXzSxhkKamPg=
+github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.4/go.mod h1:z+cMZ0iswzZOahBJ3XmNWgWkVnAd2bl8g+FhyyuPDH4=
 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=

diff --git a/models/config.go b/models/config.go
@@ -48,8 +48,7 @@ type ConfigBodyPost struct {
 	EmailFrom                  string `json:"email_from,omitempty"`
 	RobotTokenDuration         int    `json:"robot_token_duration,omitempty"`
 	LdapVerifyCert             bool   `json:"ldap_verify_cert,omitempty"`
-
-	LdapGroupGID string `json:"ldap_group_id,omitempty"`
+	LdapGroupGID               string `json:"ldap_group_gid,omitempty"`
 }
 
 type ConfigBodyResponse struct {
@@ -207,4 +206,8 @@ type ConfigBodyResponse struct {
 		Editable bool   `json:"editable,omitempty"`
 		Value    string `json:"value,omitempty"`
 	} `json:"email_from,omitempty"`
+	LdapGroupGID struct {
+		Editable bool   `json:"editable,omitempty"`
+		Value    string `json:"value,omitempty"`
+	} `json:"ldap_group_gid,omitempty"`
 }
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@ module github.com/BESTSELLER/terraform-provider-harbor

		go 1.14

		require github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.3
		require github.com/hashicorp/terraform-plugin-sdk/v2 v2.4.4