Merge pull request #12870 from liggitt/deprecate-user-groups

Merged by openshift-bot
openshift · Feb 9, 2017 · e0ccc35 · e0ccc35
2 parents 4b73eba + 487c698
commit e0ccc35
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 7 deletions.
diff --git a/api/protobuf-spec/github_com_openshift_origin_pkg_user_api_v1.proto b/api/protobuf-spec/github_com_openshift_origin_pkg_user_api_v1.proto
diff --git a/api/swagger-spec/oapi-v1.json b/api/swagger-spec/oapi-v1.json
@@ -29566,7 +29566,7 @@
       "items": {
        "type": "string"
       },
-      "description": "Groups are the groups that this user is a member of"
+      "description": "Groups specifies group names this user is a member of. This field is deprecated and will be removed in a future release. Instead, create a Group object containing the name of this User."
      }
     }
    },

diff --git a/api/swagger-spec/openshift-openapi-spec.json b/api/swagger-spec/openshift-openapi-spec.json
@@ -56446,7 +56446,7 @@
       "type": "string"
      },
      "groups": {
-      "description": "Groups are the groups that this user is a member of",
+      "description": "Groups specifies group names this user is a member of. This field is deprecated and will be removed in a future release. Instead, create a Group object containing the name of this User.",
       "type": "array",
       "items": {
        "type": "string"

diff --git a/pkg/openapi/zz_generated.openapi.go b/pkg/openapi/zz_generated.openapi.go
@@ -23889,7 +23889,7 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
 					},
 					"groups": {
 						SchemaProps: spec.SchemaProps{
-							Description: "Groups are the groups that this user is a member of",
+							Description: "Groups specifies group names this user is a member of. This field is deprecated and will be removed in a future release. Instead, create a Group object containing the name of this User.",
 							Type:        []string{"array"},
 							Items: &spec.SchemaOrArray{
 								Schema: &spec.Schema{

diff --git a/pkg/user/api/v1/generated.proto b/pkg/user/api/v1/generated.proto
diff --git a/pkg/user/api/v1/swagger_doc.go b/pkg/user/api/v1/swagger_doc.go
@@ -53,7 +53,7 @@ var map_User = map[string]string{
 	"metadata":   "Standard object's metadata.",
 	"fullName":   "FullName is the full name of user",
 	"identities": "Identities are the identities associated with this user",
-	"groups":     "Groups are the groups that this user is a member of",
+	"groups":     "Groups specifies group names this user is a member of. This field is deprecated and will be removed in a future release. Instead, create a Group object containing the name of this User.",
 }
 
 func (User) SwaggerDoc() map[string]string {

diff --git a/pkg/user/api/v1/types.go b/pkg/user/api/v1/types.go
@@ -25,7 +25,9 @@ type User struct {
 	// Identities are the identities associated with this user
 	Identities []string `json:"identities" protobuf:"bytes,3,rep,name=identities"`
 
-	// Groups are the groups that this user is a member of
+	// Groups specifies group names this user is a member of.
+	// This field is deprecated and will be removed in a future release.
+	// Instead, create a Group object containing the name of this User.
 	Groups []string `json:"groups" protobuf:"bytes,4,rep,name=groups"`
 }