diff --git a/Dockerfile b/Dockerfile index f131d69..0fe4cd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.20 as build +FROM golang:1.21 as build LABEL description="Build container" ENV CGO_ENABLED 0 diff --git a/Dockerfile.initialize b/Dockerfile.initialize index bd861a3..712b769 100644 --- a/Dockerfile.initialize +++ b/Dockerfile.initialize @@ -1,4 +1,4 @@ -FROM golang:1.20 as build +FROM golang:1.21 as build LABEL description="Build container" ENV CGO_ENABLED 0 diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer index 7b798ef..cc5cb2e 100644 --- a/Dockerfile.synchronizer +++ b/Dockerfile.synchronizer @@ -1,4 +1,4 @@ -FROM golang:1.20 as build +FROM golang:1.21 as build LABEL description="Build container" ENV CGO_ENABLED 0 diff --git a/gen/openapi/proto/rpc/audit/auditlog.swagger.json b/gen/openapi/proto/rpc/audit/auditlog.swagger.json index 26fc716..d26525e 100644 --- a/gen/openapi/proto/rpc/audit/auditlog.swagger.json +++ b/gen/openapi/proto/rpc/audit/auditlog.swagger.json @@ -447,7 +447,7 @@ "NULL_VALUE" ], "default": "NULL_VALUE", - "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\n The JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value." + "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\nThe JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value." }, "v1AuditLogQueryFilter": { "type": "object", diff --git a/gen/openapi/proto/rpc/audit/relayaudit.swagger.json b/gen/openapi/proto/rpc/audit/relayaudit.swagger.json index c105c38..f9ec738 100644 --- a/gen/openapi/proto/rpc/audit/relayaudit.swagger.json +++ b/gen/openapi/proto/rpc/audit/relayaudit.swagger.json @@ -479,7 +479,7 @@ "NULL_VALUE" ], "default": "NULL_VALUE", - "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\n The JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value." + "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\nThe JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value." }, "v1RelayAuditQueryFilter": { "type": "object", diff --git a/gen/openapi/proto/rpc/role/role.swagger.json b/gen/openapi/proto/rpc/role/role.swagger.json index 1904cbb..297abab 100644 --- a/gen/openapi/proto/rpc/role/role.swagger.json +++ b/gen/openapi/proto/rpc/role/role.swagger.json @@ -481,101 +481,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the Role resource", - "title": "API Version" - }, - "kind": { - "type": "string", - "default": "Role", - "description": "Kind of the role resource", - "title": "Kind" - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3RoleSpec", - "description": "Spec of the role resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Role", - "title": "Role", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "project" - ] + "$ref": "#/definitions/RoleServiceUpdateRoleBody" } } ], @@ -835,107 +741,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the Role resource", - "title": "API Version" - }, - "kind": { - "type": "string", - "default": "Role", - "description": "Kind of the role resource", - "title": "Kind" - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "name": { - "type": "string", - "description": "name of the resource", - "title": "Name" - }, - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3RoleSpec", - "description": "Spec of the role resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Role", - "title": "Role", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "name", - "project" - ] + "$ref": "#/definitions/RoleServiceCreateRoleBody" } } ], @@ -946,6 +752,206 @@ } }, "definitions": { + "RoleServiceCreateRoleBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the Role resource", + "title": "API Version" + }, + "kind": { + "type": "string", + "default": "Role", + "description": "Kind of the role resource", + "title": "Kind" + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "name": { + "type": "string", + "description": "name of the resource", + "title": "Name" + }, + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3RoleSpec", + "description": "Spec of the role resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Role", + "title": "Role", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "name", + "project" + ] + }, + "RoleServiceUpdateRoleBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the Role resource", + "title": "API Version" + }, + "kind": { + "type": "string", + "default": "Role", + "description": "Kind of the role resource", + "title": "Kind" + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3RoleSpec", + "description": "Spec of the role resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Role", + "title": "Role", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "project" + ] + }, "commonv3Status": { "type": "object", "properties": { diff --git a/gen/openapi/proto/rpc/scheduler/cluster.swagger.json b/gen/openapi/proto/rpc/scheduler/cluster.swagger.json index fbf0abd..c4c6fd6 100644 --- a/gen/openapi/proto/rpc/scheduler/cluster.swagger.json +++ b/gen/openapi/proto/rpc/scheduler/cluster.swagger.json @@ -69,113 +69,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "infra.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "Cluster", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "name": { - "type": "string", - "description": "name of the resource", - "title": "Name" - }, - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "partner": { - "type": "string", - "description": "Partner to which the resource belongs", - "title": "Partner" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3ClusterSpec", - "description": "Spec of the resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Cluster", - "title": "Cluster", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "name" - ] + "$ref": "#/definitions/ClusterServiceCreateClusterBody" } } ], @@ -1150,107 +1044,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "infra.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "Cluster", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "partner": { - "type": "string", - "description": "Partner to which the resource belongs", - "title": "Partner" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3ClusterSpec", - "description": "Spec of the resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Cluster", - "title": "Cluster", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec" - ] + "$ref": "#/definitions/ClusterServiceUpdateClusterBody" } } ], @@ -1881,77 +1675,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "partner": { - "type": "string", - "description": "Partner to which the resource belongs", - "title": "Partner" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "clusterStatus": { - "$ref": "#/definitions/v3ClusterStatus" - } - } + "$ref": "#/definitions/ClusterServiceUpdateClusterStatusBody" } } ], @@ -2194,6 +1918,291 @@ } }, "definitions": { + "ClusterServiceCreateClusterBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "infra.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "Cluster", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "name": { + "type": "string", + "description": "name of the resource", + "title": "Name" + }, + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "partner": { + "type": "string", + "description": "Partner to which the resource belongs", + "title": "Partner" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3ClusterSpec", + "description": "Spec of the resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Cluster", + "title": "Cluster", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "name" + ] + }, + "ClusterServiceUpdateClusterBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "infra.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "Cluster", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "partner": { + "type": "string", + "description": "Partner to which the resource belongs", + "title": "Partner" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3ClusterSpec", + "description": "Spec of the resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Cluster", + "title": "Cluster", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec" + ] + }, + "ClusterServiceUpdateClusterStatusBody": { + "type": "object", + "properties": { + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "partner": { + "type": "string", + "description": "Partner to which the resource belongs", + "title": "Partner" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "clusterStatus": { + "$ref": "#/definitions/v3ClusterStatus" + } + } + }, "commonv3Status": { "type": "object", "properties": { diff --git a/gen/openapi/proto/rpc/sentry/bootstrap.swagger.json b/gen/openapi/proto/rpc/sentry/bootstrap.swagger.json index ddf58d9..2a98547 100644 --- a/gen/openapi/proto/rpc/sentry/bootstrap.swagger.json +++ b/gen/openapi/proto/rpc/sentry/bootstrap.swagger.json @@ -216,102 +216,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "infra.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "BootstrapInfra", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "partner": { - "type": "string", - "description": "Partner to which the resource belongs", - "title": "Partner" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/sentryBootstrapInfraSpec" - }, - "status": { - "$ref": "#/definitions/sentryBootstrapInfraStatus" - } - }, - "required": [ - "project" - ] + "$ref": "#/definitions/BootstrapServicePatchBootstrapInfraBody" } } ], @@ -782,102 +687,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "infra.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "BootstrapAgentTemplate", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "partner": { - "type": "string", - "description": "Partner to which the resource belongs", - "title": "Partner" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/sentryBootstrapAgentTemplateSpec" - }, - "status": { - "$ref": "#/definitions/sentryBootstrapAgentTemplateStatus" - } - }, - "required": [ - "project" - ] + "$ref": "#/definitions/BootstrapServicePatchBootstrapAgentTemplateBody" } } ], @@ -928,42 +738,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "infra.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "BootstrapAgent", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "$ref": "#/definitions/v3Metadata", - "description": "Metadata of the resource", - "title": "Metadata" - }, - "spec": { - "type": "object", - "properties": { - "token": { - "type": "string" - }, - "agentMode": { - "$ref": "#/definitions/sentryBootstrapAgentMode" - } - } - }, - "status": { - "$ref": "#/definitions/sentryBootStrapAgentStatus" - } - } + "$ref": "#/definitions/BootstrapServiceCreateBootstrapAgentBody" } } ], @@ -1397,110 +1172,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "infra.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "BootstrapAgent", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "partner": { - "type": "string", - "description": "Partner to which the resource belongs", - "title": "Partner" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "type": "object", - "properties": { - "token": { - "type": "string" - }, - "agentMode": { - "$ref": "#/definitions/sentryBootstrapAgentMode" - } - } - }, - "status": { - "$ref": "#/definitions/sentryBootStrapAgentStatus" - } - }, - "required": [ - "project" - ] + "$ref": "#/definitions/BootstrapServiceUpdateBootstrapAgentBody" } } ], @@ -1981,28 +1653,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "templateName": { - "type": "string" - }, - "token": { - "type": "string" - }, - "csr": { - "type": "string", - "format": "byte" - }, - "ipAddress": { - "type": "string" - }, - "name": { - "type": "string" - }, - "fingerprint": { - "type": "string" - } - } + "$ref": "#/definitions/BootstrapServiceRegisterBootstrapAgentBody" } } ], @@ -2013,6 +1664,370 @@ } }, "definitions": { + "BootstrapServiceCreateBootstrapAgentBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "infra.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "BootstrapAgent", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "$ref": "#/definitions/v3Metadata", + "description": "Metadata of the resource", + "title": "Metadata" + }, + "spec": { + "type": "object", + "properties": { + "token": { + "type": "string" + }, + "agentMode": { + "$ref": "#/definitions/sentryBootstrapAgentMode" + } + } + }, + "status": { + "$ref": "#/definitions/sentryBootStrapAgentStatus" + } + } + }, + "BootstrapServicePatchBootstrapAgentTemplateBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "infra.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "BootstrapAgentTemplate", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "partner": { + "type": "string", + "description": "Partner to which the resource belongs", + "title": "Partner" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/sentryBootstrapAgentTemplateSpec" + }, + "status": { + "$ref": "#/definitions/sentryBootstrapAgentTemplateStatus" + } + }, + "required": [ + "project" + ] + }, + "BootstrapServicePatchBootstrapInfraBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "infra.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "BootstrapInfra", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "partner": { + "type": "string", + "description": "Partner to which the resource belongs", + "title": "Partner" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/sentryBootstrapInfraSpec" + }, + "status": { + "$ref": "#/definitions/sentryBootstrapInfraStatus" + } + }, + "required": [ + "project" + ] + }, + "BootstrapServiceRegisterBootstrapAgentBody": { + "type": "object", + "properties": { + "templateName": { + "type": "string" + }, + "token": { + "type": "string" + }, + "csr": { + "type": "string", + "format": "byte" + }, + "ipAddress": { + "type": "string" + }, + "name": { + "type": "string" + }, + "fingerprint": { + "type": "string" + } + } + }, + "BootstrapServiceUpdateBootstrapAgentBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "infra.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "BootstrapAgent", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "partner": { + "type": "string", + "description": "Partner to which the resource belongs", + "title": "Partner" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "type": "object", + "properties": { + "token": { + "type": "string" + }, + "agentMode": { + "$ref": "#/definitions/sentryBootstrapAgentMode" + } + } + }, + "status": { + "$ref": "#/definitions/sentryBootStrapAgentStatus" + } + }, + "required": [ + "project" + ] + }, "googlerpcStatus": { "type": "object", "properties": { diff --git a/gen/openapi/proto/rpc/sentry/kubeconfig.swagger.json b/gen/openapi/proto/rpc/sentry/kubeconfig.swagger.json index ab19c20..7ffb4a7 100644 --- a/gen/openapi/proto/rpc/sentry/kubeconfig.swagger.json +++ b/gen/openapi/proto/rpc/sentry/kubeconfig.swagger.json @@ -1066,146 +1066,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "opts": { - "type": "object", - "properties": { - "q": { - "type": "string", - "title": "query for filtering" - }, - "name": { - "type": "string", - "title": "name is unique ID of a resource along with (partnerID, organizationID,\nprojectID)" - }, - "selector": { - "type": "string", - "title": "selector is used to filter the labels of a resource" - }, - "partner": { - "type": "string" - }, - "organization": { - "type": "string" - }, - "project": { - "type": "string" - }, - "group": { - "type": "string" - }, - "role": { - "type": "string" - }, - "displayName": { - "type": "string", - "title": "displayName only used for update queries to set displayName (READONLY)" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "title": "labels only used for update queries to set labels (READONLY)" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "title": "annotations only used for update queries to set annotations (READONLY)" - }, - "count": { - "type": "string", - "format": "int64" - }, - "offset": { - "type": "string", - "format": "int64" - }, - "limit": { - "type": "string", - "format": "int64" - }, - "ignoreScopeDefault": { - "type": "boolean", - "title": "ignoreScopeDefault ignores default values for partnerID, organizationID and\nprojectID" - }, - "globalScope": { - "type": "boolean", - "title": "globalScope sets partnerID,organizationID,projectID = 0" - }, - "orderBy": { - "type": "string" - }, - "order": { - "type": "string" - }, - "deleted": { - "type": "boolean" - }, - "extended": { - "type": "boolean" - }, - "isSSOUser": { - "type": "boolean" - }, - "username": { - "type": "string" - }, - "groups": { - "type": "array", - "items": { - "type": "string" - } - }, - "blueprintRef": { - "type": "string" - }, - "publishedVersion": { - "type": "string" - }, - "clusterID": { - "type": "string" - }, - "ID": { - "type": "string" - }, - "account": { - "type": "string" - }, - "type": { - "type": "string", - "title": "generic way to specify a type of resource, mainly for use in users endpoint" - } - }, - "title": "QueryOptions is the options for performing queries on resources" - }, - "validitySeconds": { - "type": "string", - "format": "int64" - }, - "saValiditySeconds": { - "type": "string", - "format": "int64" - }, - "enableSessionCheck": { - "type": "boolean" - }, - "enablePrivateRelay": { - "type": "boolean" - }, - "enforceOrgAdminSecretAccess": { - "type": "boolean" - }, - "disableWebKubectl": { - "type": "boolean" - }, - "disableCLIKubectl": { - "type": "boolean" - } - } + "$ref": "#/definitions/KubeConfigServiceUpdateUserSettingBody" } } ], @@ -1487,146 +1348,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "opts": { - "type": "object", - "properties": { - "q": { - "type": "string", - "title": "query for filtering" - }, - "name": { - "type": "string", - "title": "name is unique ID of a resource along with (partnerID, organizationID,\nprojectID)" - }, - "selector": { - "type": "string", - "title": "selector is used to filter the labels of a resource" - }, - "partner": { - "type": "string" - }, - "organization": { - "type": "string" - }, - "project": { - "type": "string" - }, - "group": { - "type": "string" - }, - "role": { - "type": "string" - }, - "displayName": { - "type": "string", - "title": "displayName only used for update queries to set displayName (READONLY)" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "title": "labels only used for update queries to set labels (READONLY)" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "title": "annotations only used for update queries to set annotations (READONLY)" - }, - "count": { - "type": "string", - "format": "int64" - }, - "offset": { - "type": "string", - "format": "int64" - }, - "limit": { - "type": "string", - "format": "int64" - }, - "ignoreScopeDefault": { - "type": "boolean", - "title": "ignoreScopeDefault ignores default values for partnerID, organizationID and\nprojectID" - }, - "globalScope": { - "type": "boolean", - "title": "globalScope sets partnerID,organizationID,projectID = 0" - }, - "orderBy": { - "type": "string" - }, - "order": { - "type": "string" - }, - "deleted": { - "type": "boolean" - }, - "extended": { - "type": "boolean" - }, - "isSSOUser": { - "type": "boolean" - }, - "username": { - "type": "string" - }, - "groups": { - "type": "array", - "items": { - "type": "string" - } - }, - "blueprintRef": { - "type": "string" - }, - "publishedVersion": { - "type": "string" - }, - "clusterID": { - "type": "string" - }, - "ID": { - "type": "string" - }, - "account": { - "type": "string" - }, - "type": { - "type": "string", - "title": "generic way to specify a type of resource, mainly for use in users endpoint" - } - }, - "title": "QueryOptions is the options for performing queries on resources" - }, - "validitySeconds": { - "type": "string", - "format": "int64" - }, - "saValiditySeconds": { - "type": "string", - "format": "int64" - }, - "enableSessionCheck": { - "type": "boolean" - }, - "enablePrivateRelay": { - "type": "boolean" - }, - "enforceOrgAdminSecretAccess": { - "type": "boolean" - }, - "disableWebKubectl": { - "type": "boolean" - }, - "disableCLIKubectl": { - "type": "boolean" - } - } + "$ref": "#/definitions/KubeConfigServiceUpdateSSOUserSettingBody" } } ], @@ -1916,123 +1638,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "opts": { - "type": "object", - "properties": { - "q": { - "type": "string", - "title": "query for filtering" - }, - "name": { - "type": "string", - "title": "name is unique ID of a resource along with (partnerID, organizationID,\nprojectID)" - }, - "selector": { - "type": "string", - "title": "selector is used to filter the labels of a resource" - }, - "partner": { - "type": "string" - }, - "organization": { - "type": "string" - }, - "project": { - "type": "string" - }, - "group": { - "type": "string" - }, - "role": { - "type": "string" - }, - "displayName": { - "type": "string", - "title": "displayName only used for update queries to set displayName (READONLY)" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "title": "labels only used for update queries to set labels (READONLY)" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "title": "annotations only used for update queries to set annotations (READONLY)" - }, - "count": { - "type": "string", - "format": "int64" - }, - "offset": { - "type": "string", - "format": "int64" - }, - "limit": { - "type": "string", - "format": "int64" - }, - "ignoreScopeDefault": { - "type": "boolean", - "title": "ignoreScopeDefault ignores default values for partnerID, organizationID and\nprojectID" - }, - "globalScope": { - "type": "boolean", - "title": "globalScope sets partnerID,organizationID,projectID = 0" - }, - "orderBy": { - "type": "string" - }, - "order": { - "type": "string" - }, - "deleted": { - "type": "boolean" - }, - "extended": { - "type": "boolean" - }, - "isSSOUser": { - "type": "boolean" - }, - "username": { - "type": "string" - }, - "groups": { - "type": "array", - "items": { - "type": "string" - } - }, - "blueprintRef": { - "type": "string" - }, - "publishedVersion": { - "type": "string" - }, - "clusterID": { - "type": "string" - }, - "ID": { - "type": "string" - }, - "account": { - "type": "string" - }, - "type": { - "type": "string", - "title": "generic way to specify a type of resource, mainly for use in users endpoint" - } - }, - "title": "QueryOptions is the options for performing queries on resources" - } - } + "$ref": "#/definitions/KubeConfigServiceRevokeKubeconfigBody" } } ], @@ -2314,146 +1920,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "opts": { - "type": "object", - "properties": { - "q": { - "type": "string", - "title": "query for filtering" - }, - "name": { - "type": "string", - "title": "name is unique ID of a resource along with (partnerID, organizationID,\nprojectID)" - }, - "selector": { - "type": "string", - "title": "selector is used to filter the labels of a resource" - }, - "partner": { - "type": "string" - }, - "organization": { - "type": "string" - }, - "project": { - "type": "string" - }, - "group": { - "type": "string" - }, - "role": { - "type": "string" - }, - "displayName": { - "type": "string", - "title": "displayName only used for update queries to set displayName (READONLY)" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "title": "labels only used for update queries to set labels (READONLY)" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "title": "annotations only used for update queries to set annotations (READONLY)" - }, - "count": { - "type": "string", - "format": "int64" - }, - "offset": { - "type": "string", - "format": "int64" - }, - "limit": { - "type": "string", - "format": "int64" - }, - "ignoreScopeDefault": { - "type": "boolean", - "title": "ignoreScopeDefault ignores default values for partnerID, organizationID and\nprojectID" - }, - "globalScope": { - "type": "boolean", - "title": "globalScope sets partnerID,organizationID,projectID = 0" - }, - "orderBy": { - "type": "string" - }, - "order": { - "type": "string" - }, - "deleted": { - "type": "boolean" - }, - "extended": { - "type": "boolean" - }, - "isSSOUser": { - "type": "boolean" - }, - "username": { - "type": "string" - }, - "groups": { - "type": "array", - "items": { - "type": "string" - } - }, - "blueprintRef": { - "type": "string" - }, - "publishedVersion": { - "type": "string" - }, - "clusterID": { - "type": "string" - }, - "ID": { - "type": "string" - }, - "account": { - "type": "string" - }, - "type": { - "type": "string", - "title": "generic way to specify a type of resource, mainly for use in users endpoint" - } - }, - "title": "QueryOptions is the options for performing queries on resources" - }, - "validitySeconds": { - "type": "string", - "format": "int64" - }, - "saValiditySeconds": { - "type": "string", - "format": "int64" - }, - "enableSessionCheck": { - "type": "boolean" - }, - "enablePrivateRelay": { - "type": "boolean" - }, - "enforceOrgAdminSecretAccess": { - "type": "boolean" - }, - "disableWebKubectl": { - "type": "boolean" - }, - "disableCLIKubectl": { - "type": "boolean" - } - } + "$ref": "#/definitions/KubeConfigServiceUpdateOrganizationSettingBody" } } ], @@ -2464,6 +1931,551 @@ } }, "definitions": { + "KubeConfigServiceRevokeKubeconfigBody": { + "type": "object", + "properties": { + "opts": { + "type": "object", + "properties": { + "q": { + "type": "string", + "title": "query for filtering" + }, + "name": { + "type": "string", + "title": "name is unique ID of a resource along with (partnerID, organizationID,\nprojectID)" + }, + "selector": { + "type": "string", + "title": "selector is used to filter the labels of a resource" + }, + "partner": { + "type": "string" + }, + "organization": { + "type": "string" + }, + "project": { + "type": "string" + }, + "group": { + "type": "string" + }, + "role": { + "type": "string" + }, + "displayName": { + "type": "string", + "title": "displayName only used for update queries to set displayName (READONLY)" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "labels only used for update queries to set labels (READONLY)" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "annotations only used for update queries to set annotations (READONLY)" + }, + "count": { + "type": "string", + "format": "int64" + }, + "offset": { + "type": "string", + "format": "int64" + }, + "limit": { + "type": "string", + "format": "int64" + }, + "ignoreScopeDefault": { + "type": "boolean", + "title": "ignoreScopeDefault ignores default values for partnerID, organizationID and\nprojectID" + }, + "globalScope": { + "type": "boolean", + "title": "globalScope sets partnerID,organizationID,projectID = 0" + }, + "orderBy": { + "type": "string" + }, + "order": { + "type": "string" + }, + "deleted": { + "type": "boolean" + }, + "extended": { + "type": "boolean" + }, + "isSSOUser": { + "type": "boolean" + }, + "username": { + "type": "string" + }, + "groups": { + "type": "array", + "items": { + "type": "string" + } + }, + "blueprintRef": { + "type": "string" + }, + "publishedVersion": { + "type": "string" + }, + "clusterID": { + "type": "string" + }, + "ID": { + "type": "string" + }, + "account": { + "type": "string" + }, + "type": { + "type": "string", + "title": "generic way to specify a type of resource, mainly for use in users endpoint" + } + }, + "title": "QueryOptions is the options for performing queries on resources" + } + } + }, + "KubeConfigServiceUpdateOrganizationSettingBody": { + "type": "object", + "properties": { + "opts": { + "type": "object", + "properties": { + "q": { + "type": "string", + "title": "query for filtering" + }, + "name": { + "type": "string", + "title": "name is unique ID of a resource along with (partnerID, organizationID,\nprojectID)" + }, + "selector": { + "type": "string", + "title": "selector is used to filter the labels of a resource" + }, + "partner": { + "type": "string" + }, + "organization": { + "type": "string" + }, + "project": { + "type": "string" + }, + "group": { + "type": "string" + }, + "role": { + "type": "string" + }, + "displayName": { + "type": "string", + "title": "displayName only used for update queries to set displayName (READONLY)" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "labels only used for update queries to set labels (READONLY)" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "annotations only used for update queries to set annotations (READONLY)" + }, + "count": { + "type": "string", + "format": "int64" + }, + "offset": { + "type": "string", + "format": "int64" + }, + "limit": { + "type": "string", + "format": "int64" + }, + "ignoreScopeDefault": { + "type": "boolean", + "title": "ignoreScopeDefault ignores default values for partnerID, organizationID and\nprojectID" + }, + "globalScope": { + "type": "boolean", + "title": "globalScope sets partnerID,organizationID,projectID = 0" + }, + "orderBy": { + "type": "string" + }, + "order": { + "type": "string" + }, + "deleted": { + "type": "boolean" + }, + "extended": { + "type": "boolean" + }, + "isSSOUser": { + "type": "boolean" + }, + "username": { + "type": "string" + }, + "groups": { + "type": "array", + "items": { + "type": "string" + } + }, + "blueprintRef": { + "type": "string" + }, + "publishedVersion": { + "type": "string" + }, + "clusterID": { + "type": "string" + }, + "ID": { + "type": "string" + }, + "account": { + "type": "string" + }, + "type": { + "type": "string", + "title": "generic way to specify a type of resource, mainly for use in users endpoint" + } + }, + "title": "QueryOptions is the options for performing queries on resources" + }, + "validitySeconds": { + "type": "string", + "format": "int64" + }, + "saValiditySeconds": { + "type": "string", + "format": "int64" + }, + "enableSessionCheck": { + "type": "boolean" + }, + "enablePrivateRelay": { + "type": "boolean" + }, + "enforceOrgAdminSecretAccess": { + "type": "boolean" + }, + "disableWebKubectl": { + "type": "boolean" + }, + "disableCLIKubectl": { + "type": "boolean" + } + } + }, + "KubeConfigServiceUpdateSSOUserSettingBody": { + "type": "object", + "properties": { + "opts": { + "type": "object", + "properties": { + "q": { + "type": "string", + "title": "query for filtering" + }, + "name": { + "type": "string", + "title": "name is unique ID of a resource along with (partnerID, organizationID,\nprojectID)" + }, + "selector": { + "type": "string", + "title": "selector is used to filter the labels of a resource" + }, + "partner": { + "type": "string" + }, + "organization": { + "type": "string" + }, + "project": { + "type": "string" + }, + "group": { + "type": "string" + }, + "role": { + "type": "string" + }, + "displayName": { + "type": "string", + "title": "displayName only used for update queries to set displayName (READONLY)" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "labels only used for update queries to set labels (READONLY)" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "annotations only used for update queries to set annotations (READONLY)" + }, + "count": { + "type": "string", + "format": "int64" + }, + "offset": { + "type": "string", + "format": "int64" + }, + "limit": { + "type": "string", + "format": "int64" + }, + "ignoreScopeDefault": { + "type": "boolean", + "title": "ignoreScopeDefault ignores default values for partnerID, organizationID and\nprojectID" + }, + "globalScope": { + "type": "boolean", + "title": "globalScope sets partnerID,organizationID,projectID = 0" + }, + "orderBy": { + "type": "string" + }, + "order": { + "type": "string" + }, + "deleted": { + "type": "boolean" + }, + "extended": { + "type": "boolean" + }, + "isSSOUser": { + "type": "boolean" + }, + "username": { + "type": "string" + }, + "groups": { + "type": "array", + "items": { + "type": "string" + } + }, + "blueprintRef": { + "type": "string" + }, + "publishedVersion": { + "type": "string" + }, + "clusterID": { + "type": "string" + }, + "ID": { + "type": "string" + }, + "account": { + "type": "string" + }, + "type": { + "type": "string", + "title": "generic way to specify a type of resource, mainly for use in users endpoint" + } + }, + "title": "QueryOptions is the options for performing queries on resources" + }, + "validitySeconds": { + "type": "string", + "format": "int64" + }, + "saValiditySeconds": { + "type": "string", + "format": "int64" + }, + "enableSessionCheck": { + "type": "boolean" + }, + "enablePrivateRelay": { + "type": "boolean" + }, + "enforceOrgAdminSecretAccess": { + "type": "boolean" + }, + "disableWebKubectl": { + "type": "boolean" + }, + "disableCLIKubectl": { + "type": "boolean" + } + } + }, + "KubeConfigServiceUpdateUserSettingBody": { + "type": "object", + "properties": { + "opts": { + "type": "object", + "properties": { + "q": { + "type": "string", + "title": "query for filtering" + }, + "name": { + "type": "string", + "title": "name is unique ID of a resource along with (partnerID, organizationID,\nprojectID)" + }, + "selector": { + "type": "string", + "title": "selector is used to filter the labels of a resource" + }, + "partner": { + "type": "string" + }, + "organization": { + "type": "string" + }, + "project": { + "type": "string" + }, + "group": { + "type": "string" + }, + "role": { + "type": "string" + }, + "displayName": { + "type": "string", + "title": "displayName only used for update queries to set displayName (READONLY)" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "labels only used for update queries to set labels (READONLY)" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "annotations only used for update queries to set annotations (READONLY)" + }, + "count": { + "type": "string", + "format": "int64" + }, + "offset": { + "type": "string", + "format": "int64" + }, + "limit": { + "type": "string", + "format": "int64" + }, + "ignoreScopeDefault": { + "type": "boolean", + "title": "ignoreScopeDefault ignores default values for partnerID, organizationID and\nprojectID" + }, + "globalScope": { + "type": "boolean", + "title": "globalScope sets partnerID,organizationID,projectID = 0" + }, + "orderBy": { + "type": "string" + }, + "order": { + "type": "string" + }, + "deleted": { + "type": "boolean" + }, + "extended": { + "type": "boolean" + }, + "isSSOUser": { + "type": "boolean" + }, + "username": { + "type": "string" + }, + "groups": { + "type": "array", + "items": { + "type": "string" + } + }, + "blueprintRef": { + "type": "string" + }, + "publishedVersion": { + "type": "string" + }, + "clusterID": { + "type": "string" + }, + "ID": { + "type": "string" + }, + "account": { + "type": "string" + }, + "type": { + "type": "string", + "title": "generic way to specify a type of resource, mainly for use in users endpoint" + } + }, + "title": "QueryOptions is the options for performing queries on resources" + }, + "validitySeconds": { + "type": "string", + "format": "int64" + }, + "saValiditySeconds": { + "type": "string", + "format": "int64" + }, + "enableSessionCheck": { + "type": "boolean" + }, + "enablePrivateRelay": { + "type": "boolean" + }, + "enforceOrgAdminSecretAccess": { + "type": "boolean" + }, + "disableWebKubectl": { + "type": "boolean" + }, + "disableCLIKubectl": { + "type": "boolean" + } + } + }, "googlerpcStatus": { "type": "object", "properties": { diff --git a/gen/openapi/proto/rpc/sentry/kubectl_cluster.swagger.json b/gen/openapi/proto/rpc/sentry/kubectl_cluster.swagger.json index ebc7670..486a5e9 100644 --- a/gen/openapi/proto/rpc/sentry/kubectl_cluster.swagger.json +++ b/gen/openapi/proto/rpc/sentry/kubectl_cluster.swagger.json @@ -297,129 +297,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "opts": { - "type": "object", - "properties": { - "q": { - "type": "string", - "title": "query for filtering" - }, - "name": { - "type": "string", - "title": "name is unique ID of a resource along with (partnerID, organizationID,\nprojectID)" - }, - "selector": { - "type": "string", - "title": "selector is used to filter the labels of a resource" - }, - "partner": { - "type": "string" - }, - "organization": { - "type": "string" - }, - "project": { - "type": "string" - }, - "group": { - "type": "string" - }, - "role": { - "type": "string" - }, - "displayName": { - "type": "string", - "title": "displayName only used for update queries to set displayName (READONLY)" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "title": "labels only used for update queries to set labels (READONLY)" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "title": "annotations only used for update queries to set annotations (READONLY)" - }, - "count": { - "type": "string", - "format": "int64" - }, - "offset": { - "type": "string", - "format": "int64" - }, - "limit": { - "type": "string", - "format": "int64" - }, - "ignoreScopeDefault": { - "type": "boolean", - "title": "ignoreScopeDefault ignores default values for partnerID, organizationID and\nprojectID" - }, - "globalScope": { - "type": "boolean", - "title": "globalScope sets partnerID,organizationID,projectID = 0" - }, - "orderBy": { - "type": "string" - }, - "order": { - "type": "string" - }, - "deleted": { - "type": "boolean" - }, - "extended": { - "type": "boolean" - }, - "isSSOUser": { - "type": "boolean" - }, - "username": { - "type": "string" - }, - "groups": { - "type": "array", - "items": { - "type": "string" - } - }, - "blueprintRef": { - "type": "string" - }, - "publishedVersion": { - "type": "string" - }, - "clusterID": { - "type": "string" - }, - "ID": { - "type": "string" - }, - "account": { - "type": "string" - }, - "type": { - "type": "string", - "title": "generic way to specify a type of resource, mainly for use in users endpoint" - } - }, - "title": "QueryOptions is the options for performing queries on resources" - }, - "disableWebKubectl": { - "type": "boolean" - }, - "disableCLIKubectl": { - "type": "boolean" - } - } + "$ref": "#/definitions/KubectlClusterSettingsServiceUpdateKubectlClusterSettingsBody" } } ], @@ -430,6 +308,131 @@ } }, "definitions": { + "KubectlClusterSettingsServiceUpdateKubectlClusterSettingsBody": { + "type": "object", + "properties": { + "opts": { + "type": "object", + "properties": { + "q": { + "type": "string", + "title": "query for filtering" + }, + "name": { + "type": "string", + "title": "name is unique ID of a resource along with (partnerID, organizationID,\nprojectID)" + }, + "selector": { + "type": "string", + "title": "selector is used to filter the labels of a resource" + }, + "partner": { + "type": "string" + }, + "organization": { + "type": "string" + }, + "project": { + "type": "string" + }, + "group": { + "type": "string" + }, + "role": { + "type": "string" + }, + "displayName": { + "type": "string", + "title": "displayName only used for update queries to set displayName (READONLY)" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "labels only used for update queries to set labels (READONLY)" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "title": "annotations only used for update queries to set annotations (READONLY)" + }, + "count": { + "type": "string", + "format": "int64" + }, + "offset": { + "type": "string", + "format": "int64" + }, + "limit": { + "type": "string", + "format": "int64" + }, + "ignoreScopeDefault": { + "type": "boolean", + "title": "ignoreScopeDefault ignores default values for partnerID, organizationID and\nprojectID" + }, + "globalScope": { + "type": "boolean", + "title": "globalScope sets partnerID,organizationID,projectID = 0" + }, + "orderBy": { + "type": "string" + }, + "order": { + "type": "string" + }, + "deleted": { + "type": "boolean" + }, + "extended": { + "type": "boolean" + }, + "isSSOUser": { + "type": "boolean" + }, + "username": { + "type": "string" + }, + "groups": { + "type": "array", + "items": { + "type": "string" + } + }, + "blueprintRef": { + "type": "string" + }, + "publishedVersion": { + "type": "string" + }, + "clusterID": { + "type": "string" + }, + "ID": { + "type": "string" + }, + "account": { + "type": "string" + }, + "type": { + "type": "string", + "title": "generic way to specify a type of resource, mainly for use in users endpoint" + } + }, + "title": "QueryOptions is the options for performing queries on resources" + }, + "disableWebKubectl": { + "type": "boolean" + }, + "disableCLIKubectl": { + "type": "boolean" + } + } + }, "googlerpcStatus": { "type": "object", "properties": { diff --git a/gen/openapi/proto/rpc/system/idp.swagger.json b/gen/openapi/proto/rpc/system/idp.swagger.json index 07baad1..376ac3f 100644 --- a/gen/openapi/proto/rpc/system/idp.swagger.json +++ b/gen/openapi/proto/rpc/system/idp.swagger.json @@ -638,111 +638,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the idp resource", - "title": "API Version" - }, - "kind": { - "type": "string", - "default": "Idp", - "description": "Kind of the idp resource", - "title": "Kind" - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "partner": { - "type": "string", - "description": "Partner to which the resource belongs", - "title": "Partner" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3IdpSpec", - "description": "Spec of the idp resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Idp", - "title": "Idp", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "project" - ] + "$ref": "#/definitions/IdpServiceUpdateIdpBody" } } ], @@ -753,6 +649,113 @@ } }, "definitions": { + "IdpServiceUpdateIdpBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the idp resource", + "title": "API Version" + }, + "kind": { + "type": "string", + "default": "Idp", + "description": "Kind of the idp resource", + "title": "Kind" + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "partner": { + "type": "string", + "description": "Partner to which the resource belongs", + "title": "Partner" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3IdpSpec", + "description": "Spec of the idp resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Idp", + "title": "Idp", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "project" + ] + }, "commonv3Status": { "type": "object", "properties": { diff --git a/gen/openapi/proto/rpc/system/metro.swagger.json b/gen/openapi/proto/rpc/system/metro.swagger.json index d49a0df..ab91918 100644 --- a/gen/openapi/proto/rpc/system/metro.swagger.json +++ b/gen/openapi/proto/rpc/system/metro.swagger.json @@ -306,114 +306,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "infra.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "Location", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "name": { - "type": "string", - "description": "name of the resource", - "title": "Name" - }, - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3Metro", - "description": "Spec of the resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Location", - "title": "Location", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "name", - "project" - ] + "$ref": "#/definitions/LocationServiceCreateLocationBody" } } ], @@ -948,108 +841,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "infra.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "Location", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3Metro", - "description": "Spec of the resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Location", - "title": "Location", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "project" - ] + "$ref": "#/definitions/LocationServiceUpdateLocationBody" } } ], @@ -1060,6 +852,220 @@ } }, "definitions": { + "LocationServiceCreateLocationBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "infra.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "Location", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "name": { + "type": "string", + "description": "name of the resource", + "title": "Name" + }, + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3Metro", + "description": "Spec of the resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Location", + "title": "Location", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "name", + "project" + ] + }, + "LocationServiceUpdateLocationBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "infra.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "Location", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3Metro", + "description": "Spec of the resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Location", + "title": "Location", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "project" + ] + }, "commonv3Status": { "type": "object", "properties": { diff --git a/gen/openapi/proto/rpc/system/oidc_provider.swagger.json b/gen/openapi/proto/rpc/system/oidc_provider.swagger.json index 6e0f4e9..f6ea269 100644 --- a/gen/openapi/proto/rpc/system/oidc_provider.swagger.json +++ b/gen/openapi/proto/rpc/system/oidc_provider.swagger.json @@ -638,111 +638,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the OIDCProvider resource", - "title": "API Version" - }, - "kind": { - "type": "string", - "default": "OIDCProvider", - "description": "Kind of the OIDCProvider resource", - "title": "Kind" - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "partner": { - "type": "string", - "description": "Partner to which the resource belongs", - "title": "Partner" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3OIDCProviderSpec", - "description": "Spec of the OIDCProvider resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Open Id Connect Provider", - "title": "OIDCProvider", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "project" - ] + "$ref": "#/definitions/OIDCProviderServiceUpdateOIDCProviderBody" } } ], @@ -753,6 +649,113 @@ } }, "definitions": { + "OIDCProviderServiceUpdateOIDCProviderBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the OIDCProvider resource", + "title": "API Version" + }, + "kind": { + "type": "string", + "default": "OIDCProvider", + "description": "Kind of the OIDCProvider resource", + "title": "Kind" + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "partner": { + "type": "string", + "description": "Partner to which the resource belongs", + "title": "Partner" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3OIDCProviderSpec", + "description": "Spec of the OIDCProvider resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Open Id Connect Provider", + "title": "OIDCProvider", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "project" + ] + }, "commonv3Status": { "type": "object", "properties": { @@ -826,7 +829,7 @@ "NULL_VALUE" ], "default": "NULL_VALUE", - "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\n The JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value." + "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\nThe JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value." }, "v3ConditionStatus": { "type": "string", diff --git a/gen/openapi/proto/rpc/system/organization.swagger.json b/gen/openapi/proto/rpc/system/organization.swagger.json index 4236913..46d8678 100644 --- a/gen/openapi/proto/rpc/system/organization.swagger.json +++ b/gen/openapi/proto/rpc/system/organization.swagger.json @@ -69,114 +69,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "Organization", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "name": { - "type": "string", - "description": "name of the resource", - "title": "Name" - }, - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3OrganizationSpec", - "description": "Spec of the resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Organization", - "title": "Organization", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "name", - "project" - ] + "$ref": "#/definitions/OrganizationServiceCreateOrganizationBody" } } ], @@ -829,108 +722,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "Organization", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3OrganizationSpec", - "description": "Spec of the resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Organization", - "title": "Organization", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "project" - ] + "$ref": "#/definitions/OrganizationServiceUpdateOrganizationBody" } } ], @@ -1239,6 +1031,220 @@ } }, "definitions": { + "OrganizationServiceCreateOrganizationBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "Organization", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "name": { + "type": "string", + "description": "name of the resource", + "title": "Name" + }, + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3OrganizationSpec", + "description": "Spec of the resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Organization", + "title": "Organization", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "name", + "project" + ] + }, + "OrganizationServiceUpdateOrganizationBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "Organization", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3OrganizationSpec", + "description": "Spec of the resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Organization", + "title": "Organization", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "project" + ] + }, "commonv3Status": { "type": "object", "properties": { diff --git a/gen/openapi/proto/rpc/system/partner.swagger.json b/gen/openapi/proto/rpc/system/partner.swagger.json index bc1a5e1..c7cb05a 100644 --- a/gen/openapi/proto/rpc/system/partner.swagger.json +++ b/gen/openapi/proto/rpc/system/partner.swagger.json @@ -650,113 +650,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "Partner", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "partner": { - "type": "string", - "description": "Partner to which the resource belongs", - "title": "Partner" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3PartnerSpec", - "description": "Spec of the resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Partner", - "title": "Partner", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "project" - ] + "$ref": "#/definitions/PartnerServiceUpdatePartnerBody" } } ], @@ -767,6 +661,115 @@ } }, "definitions": { + "PartnerServiceUpdatePartnerBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "Partner", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "partner": { + "type": "string", + "description": "Partner to which the resource belongs", + "title": "Partner" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3PartnerSpec", + "description": "Spec of the resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Partner", + "title": "Partner", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "project" + ] + }, "commonv3Status": { "type": "object", "properties": { @@ -840,7 +843,7 @@ "NULL_VALUE" ], "default": "NULL_VALUE", - "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\n The JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value." + "description": "`NullValue` is a singleton enumeration to represent the null value for the\n`Value` type union.\n\nThe JSON representation for `NullValue` is JSON `null`.\n\n - NULL_VALUE: Null value." }, "v3ConditionStatus": { "type": "string", diff --git a/gen/openapi/proto/rpc/system/project.swagger.json b/gen/openapi/proto/rpc/system/project.swagger.json index ded0464..42a9af9 100644 --- a/gen/openapi/proto/rpc/system/project.swagger.json +++ b/gen/openapi/proto/rpc/system/project.swagger.json @@ -76,109 +76,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "Project", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "name": { - "type": "string", - "description": "name of the resource", - "title": "Name" - }, - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3ProjectSpec", - "description": "Spec of the resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Project", - "title": "Project", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "name", - "project" - ] + "$ref": "#/definitions/ProjectServiceCreateProjectBody" } } ], @@ -594,103 +492,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the resource", - "title": "API Version", - "readOnly": true - }, - "kind": { - "type": "string", - "default": "Project", - "description": "Kind of the resource", - "title": "Kind", - "readOnly": true - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3ProjectSpec", - "description": "Spec of the resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Project", - "title": "Project", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "project" - ] + "$ref": "#/definitions/ProjectServiceUpdateProjectBody" } } ], @@ -877,6 +679,210 @@ } }, "definitions": { + "ProjectServiceCreateProjectBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "Project", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "name": { + "type": "string", + "description": "name of the resource", + "title": "Name" + }, + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3ProjectSpec", + "description": "Spec of the resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Project", + "title": "Project", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "name", + "project" + ] + }, + "ProjectServiceUpdateProjectBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the resource", + "title": "API Version", + "readOnly": true + }, + "kind": { + "type": "string", + "default": "Project", + "description": "Kind of the resource", + "title": "Kind", + "readOnly": true + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3ProjectSpec", + "description": "Spec of the resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Project", + "title": "Project", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "project" + ] + }, "commonv3Status": { "type": "object", "properties": { diff --git a/gen/openapi/proto/rpc/user/group.swagger.json b/gen/openapi/proto/rpc/user/group.swagger.json index b4e3067..9e7834d 100644 --- a/gen/openapi/proto/rpc/user/group.swagger.json +++ b/gen/openapi/proto/rpc/user/group.swagger.json @@ -453,101 +453,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the group resource", - "title": "API Version" - }, - "kind": { - "type": "string", - "default": "Group", - "description": "Kind of the group resource", - "title": "Kind" - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3GroupSpec", - "description": "Metadata of the group resource", - "title": "Metadata" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Group", - "title": "Group", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "project" - ] + "$ref": "#/definitions/GroupServiceUpdateGroupBody" } } ], @@ -608,107 +514,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the group resource", - "title": "API Version" - }, - "kind": { - "type": "string", - "default": "Group", - "description": "Kind of the group resource", - "title": "Kind" - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "name": { - "type": "string", - "description": "name of the resource", - "title": "Name" - }, - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3GroupSpec", - "description": "Metadata of the group resource", - "title": "Metadata" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "Group", - "title": "Group", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "name", - "project" - ] + "$ref": "#/definitions/GroupServiceCreateGroupBody" } } ], @@ -951,6 +757,206 @@ } }, "definitions": { + "GroupServiceCreateGroupBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the group resource", + "title": "API Version" + }, + "kind": { + "type": "string", + "default": "Group", + "description": "Kind of the group resource", + "title": "Kind" + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "name": { + "type": "string", + "description": "name of the resource", + "title": "Name" + }, + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3GroupSpec", + "description": "Metadata of the group resource", + "title": "Metadata" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Group", + "title": "Group", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "name", + "project" + ] + }, + "GroupServiceUpdateGroupBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the group resource", + "title": "API Version" + }, + "kind": { + "type": "string", + "default": "Group", + "description": "Kind of the group resource", + "title": "Kind" + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3GroupSpec", + "description": "Metadata of the group resource", + "title": "Metadata" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "Group", + "title": "Group", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "project" + ] + }, "commonv3Status": { "type": "object", "properties": { diff --git a/gen/openapi/proto/rpc/user/user.swagger.json b/gen/openapi/proto/rpc/user/user.swagger.json index b26c92b..f42d56e 100644 --- a/gen/openapi/proto/rpc/user/user.swagger.json +++ b/gen/openapi/proto/rpc/user/user.swagger.json @@ -696,111 +696,7 @@ "in": "body", "required": true, "schema": { - "type": "object", - "properties": { - "apiVersion": { - "type": "string", - "default": "system.k8smgmt.io/v3", - "description": "API Version of the user resource", - "title": "API Version" - }, - "kind": { - "type": "string", - "default": "User", - "description": "Kind of the user resource", - "title": "Kind" - }, - "metadata": { - "type": "object", - "example": { - "name": "some-name", - "project": "defaultproject" - }, - "properties": { - "displayName": { - "type": "string", - "description": "display name of the resource", - "title": "Display Name" - }, - "description": { - "type": "string", - "description": "description of the resource", - "title": "Description" - }, - "labels": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "labels of the resource", - "title": "Labels" - }, - "annotations": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "description": "annotations of the resource", - "title": "Annotations" - }, - "project": { - "type": "string", - "description": "Project of the resource", - "title": "Project" - }, - "organization": { - "type": "string", - "description": "Organization to which the resource belongs", - "title": "Organization" - }, - "partner": { - "type": "string", - "description": "Partner to which the resource belongs", - "title": "Partner" - }, - "id": { - "type": "string", - "readOnly": true - }, - "urlScope": { - "type": "string", - "readOnly": true - }, - "createdAt": { - "type": "string", - "format": "date-time", - "readOnly": true - }, - "modifiedAt": { - "type": "string", - "format": "date-time", - "readOnly": true - } - }, - "description": "metadata of the resource", - "title": "Metadata" - }, - "spec": { - "$ref": "#/definitions/v3UserSpec", - "description": "Spec of the user resource", - "title": "Spec" - }, - "status": { - "$ref": "#/definitions/commonv3Status", - "description": "Status of the resource", - "title": "Status", - "readOnly": true - } - }, - "description": "User", - "title": "User", - "required": [ - "apiVersion", - "kind", - "metadata", - "spec", - "project" - ] + "$ref": "#/definitions/UserServiceUpdateUserBody" } } ], @@ -849,6 +745,18 @@ "in": "query", "required": false, "type": "string" + }, + { + "name": "organizationId", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "partnerId", + "in": "query", + "required": false, + "type": "string" } ], "tags": [ @@ -896,6 +804,18 @@ "in": "path", "required": true, "type": "string" + }, + { + "name": "organizationId", + "in": "query", + "required": false, + "type": "string" + }, + { + "name": "partnerId", + "in": "query", + "required": false, + "type": "string" } ], "tags": [ @@ -1480,6 +1400,113 @@ } }, "definitions": { + "UserServiceUpdateUserBody": { + "type": "object", + "properties": { + "apiVersion": { + "type": "string", + "default": "system.k8smgmt.io/v3", + "description": "API Version of the user resource", + "title": "API Version" + }, + "kind": { + "type": "string", + "default": "User", + "description": "Kind of the user resource", + "title": "Kind" + }, + "metadata": { + "type": "object", + "example": { + "name": "some-name", + "project": "defaultproject" + }, + "properties": { + "displayName": { + "type": "string", + "description": "display name of the resource", + "title": "Display Name" + }, + "description": { + "type": "string", + "description": "description of the resource", + "title": "Description" + }, + "labels": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "labels of the resource", + "title": "Labels" + }, + "annotations": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "description": "annotations of the resource", + "title": "Annotations" + }, + "project": { + "type": "string", + "description": "Project of the resource", + "title": "Project" + }, + "organization": { + "type": "string", + "description": "Organization to which the resource belongs", + "title": "Organization" + }, + "partner": { + "type": "string", + "description": "Partner to which the resource belongs", + "title": "Partner" + }, + "id": { + "type": "string", + "readOnly": true + }, + "urlScope": { + "type": "string", + "readOnly": true + }, + "createdAt": { + "type": "string", + "format": "date-time", + "readOnly": true + }, + "modifiedAt": { + "type": "string", + "format": "date-time", + "readOnly": true + } + }, + "description": "metadata of the resource", + "title": "Metadata" + }, + "spec": { + "$ref": "#/definitions/v3UserSpec", + "description": "Spec of the user resource", + "title": "Spec" + }, + "status": { + "$ref": "#/definitions/commonv3Status", + "description": "Status of the resource", + "title": "Status", + "readOnly": true + } + }, + "description": "User", + "title": "User", + "required": [ + "apiVersion", + "kind", + "metadata", + "spec", + "project" + ] + }, "commonv3Status": { "type": "object", "properties": { diff --git a/go.mod b/go.mod index 71214f2..ad4a2b6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/paralus/paralus -go 1.20 +go 1.21 require ( github.com/DATA-DOG/go-sqlmock v1.5.0 @@ -16,9 +16,9 @@ require ( github.com/go-openapi/strfmt v0.21.2 github.com/go-openapi/swag v0.21.1 github.com/go-openapi/validate v0.21.0 - github.com/google/uuid v1.3.0 + github.com/google/uuid v1.6.0 github.com/grpc-ecosystem/grpc-gateway v1.16.0 - github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.3 + github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 github.com/json-iterator/go v1.1.12 github.com/ory/kratos-client-go v0.11.0 github.com/pkg/errors v0.9.1 @@ -36,8 +36,8 @@ require ( github.com/valyala/fastjson v1.6.3 go.uber.org/zap v1.21.0 google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 - google.golang.org/grpc v1.56.3 - google.golang.org/protobuf v1.30.0 + google.golang.org/grpc v1.64.0 + google.golang.org/protobuf v1.34.1 gopkg.in/natefinch/lumberjack.v2 v2.0.0 gopkg.in/yaml.v2 v2.4.0 gorm.io/driver/postgres v1.2.2 @@ -78,11 +78,11 @@ require ( github.com/gogo/protobuf v1.3.2 // indirect github.com/golang-jwt/jwt/v4 v4.4.3 // indirect github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe // indirect - github.com/golang/glog v1.1.0 // indirect + github.com/golang/glog v1.2.0 // indirect github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect github.com/golang/mock v1.6.0 // indirect - github.com/golang/protobuf v1.5.3 // indirect - github.com/google/go-cmp v0.5.9 // indirect + github.com/golang/protobuf v1.5.4 // indirect + github.com/google/go-cmp v0.6.0 // indirect github.com/google/gofuzz v1.2.0 // indirect github.com/googleapis/gnostic v0.5.5 // indirect github.com/hashicorp/hcl v1.0.0 // indirect @@ -130,15 +130,14 @@ require ( go.mongodb.org/mongo-driver v1.8.3 // indirect go.uber.org/atomic v1.9.0 // indirect go.uber.org/multierr v1.6.0 // indirect - golang.org/x/crypto v0.14.0 // indirect - golang.org/x/net v0.17.0 // indirect - golang.org/x/oauth2 v0.7.0 // indirect - golang.org/x/sys v0.13.0 // indirect - golang.org/x/term v0.13.0 // indirect - golang.org/x/text v0.13.0 // indirect + golang.org/x/crypto v0.21.0 // indirect + golang.org/x/net v0.23.0 // indirect + golang.org/x/oauth2 v0.20.0 // indirect + golang.org/x/sys v0.18.0 // indirect + golang.org/x/term v0.18.0 // indirect + golang.org/x/text v0.15.0 // indirect golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect - google.golang.org/appengine v1.6.7 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect diff --git a/go.sum b/go.sum index 7359c53..c02e2b3 100644 --- a/go.sum +++ b/go.sum @@ -289,8 +289,8 @@ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe h1:lXe2qZdvpiX5WZ github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= -github.com/golang/glog v1.1.0 h1:/d3pCKDPWNnvIWe0vVUpNP32qc8U3PDVxySP/y360qE= -github.com/golang/glog v1.1.0/go.mod h1:pfYeQZ3JWZoXTV5sFc986z3HTpwQs9At6P4ImfuP3NQ= +github.com/golang/glog v1.2.0 h1:uCdmnmatrKCgMBlM4rMuJZWOkPDqdbZPnrMXDY4gI68= +github.com/golang/glog v1.2.0/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= github.com/golang/groupcache v0.0.0-20191027212112-611e8accdfc9/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -326,8 +326,8 @@ github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= +github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -345,8 +345,8 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= -github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= +github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= github.com/google/gofuzz v0.0.0-20161122191042-44d81051d367/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/gofuzz v1.1.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= @@ -369,8 +369,8 @@ github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLe github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= -github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= +github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.0.0-20170729233727-0c5108395e2d/go.mod h1:sJBsCZ4ayReDTBIg8b9dl28c5xFWyhBTVRp3pOg5EKY= @@ -389,8 +389,8 @@ github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgf github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.3 h1:I8MsauTJQXZ8df8qJvEln0kYNc3bSapuaSsEsnFdEFU= -github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.3/go.mod h1:lZdb/YAJUSj9OqrCHs2ihjtoO3+xK3G53wTYXFWRGDo= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1YCS1PXdKYWi8FsN0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k= github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -509,6 +509,7 @@ github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfn github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= +github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= @@ -580,6 +581,7 @@ github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1 h1:EGfNDEx6MqHz8B3uNV6QAib1UR2Lm97sHi3ocA6ESJ4= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/onsi/ginkgo v0.0.0-20170829012221-11459a886d9c/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= @@ -587,10 +589,12 @@ github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+W github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= github.com/onsi/gomega v0.0.0-20170829124025-dcabb60a477c/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA= github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= github.com/onsi/gomega v1.17.0 h1:9Luw4uT5HTjHTN8+aNcSThgH1vdXnmdJ8xIfZ4wyTRE= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs= github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= @@ -653,6 +657,7 @@ github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= +github.com/rogpeppe/go-internal v1.9.0/go.mod h1:WtVeX8xhTBvf0smdhujwtBcq4Qrzq/fJaraNFVN+nFs= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/xid v1.3.0 h1:6NjYksEUlhurdVehpc7S7dk6DAmcKv8V9gG0FsVN2U4= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= @@ -722,6 +727,7 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= @@ -801,6 +807,7 @@ go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= go.uber.org/goleak v1.1.10/go.mod h1:8a7PlsEVH3e/a/GLqe5IIrQx6GzcnRmZEufDUTk4A7A= go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/goleak v1.1.12 h1:gZAh5/EyT/HQwlpkCy6wTpqfH9H8Lz8zbm3dZh+OyzA= +go.uber.org/goleak v1.1.12/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ= go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= go.uber.org/multierr v1.3.0/go.mod h1:VgVr7evmIr6uPjLBxg28wmKNXyqE9akIJ5XnfpiKl+4= go.uber.org/multierr v1.5.0/go.mod h1:FeouvMocqHpRaaGuG9EjoKcStLC43Zu/fmqdUMPcKYU= @@ -835,8 +842,8 @@ golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5y golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= -golang.org/x/crypto v0.14.0 h1:wBqGXzWJW6m1XrIKlAH0Hs1JJ7+9KBwnIO8v66Q9cHc= -golang.org/x/crypto v0.14.0/go.mod h1:MVFd36DqK4CsrnJYDkBA3VC4m2GkXAM0PvzMCn4JQf4= +golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= +golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= @@ -924,8 +931,8 @@ golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.17.0 h1:pVaXccu2ozPjCXewfr1S7xza/zcXTity9cCdXQYSjIM= -golang.org/x/net v0.17.0/go.mod h1:NxSsAGuq816PNPmqtQdLE42eU2Fs7NoRIZrHJAlaCOE= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -940,8 +947,8 @@ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g= -golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4= +golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo= +golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1029,14 +1036,14 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20211110154304-99a53858aa08/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211123173158-ef496fb156ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.13.0 h1:Af8nKPmuFypiUBjVoU9V20FiaFXOcuZI21p0ycVYYGE= -golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= +golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.13.0 h1:bb+I9cTfFazGW51MZqBVmZy7+JEJMouUHTUSKVQLBek= -golang.org/x/term v0.13.0/go.mod h1:LTmsnFJwVN6bCy1rVCoS+qHT1HhALEFxKncY3WNNh4U= +golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= +golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1047,8 +1054,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.13.0 h1:ablQoSUd0tRdKxZewP80B+BaqeKJuVhuRxj/dkrun3k= -golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= +golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk= +golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1125,6 +1132,7 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210820212750-d4cc65f0b2ff/go.mod h1:YD9qOF0M9xpSpdWTBbzEl5e/RnCefISl8E5Noe10jFM= golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1161,7 +1169,6 @@ google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= -google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= 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= @@ -1232,8 +1239,8 @@ google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAG google.golang.org/grpc v1.37.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= -google.golang.org/grpc v1.56.3 h1:8I4C0Yq1EjstUzUJzpcRVbuYA2mODtEmpWiQoN/b2nc= -google.golang.org/grpc v1.56.3/go.mod h1:I9bI3vqKfayGqPUAwGdOSu7kt6oIJLixfffKrpXqQ9s= +google.golang.org/grpc v1.64.0 h1:KH3VH9y/MgNQg1dE7b3XfVK0GsPSIzJwdF617gUSbvY= +google.golang.org/grpc v1.64.0/go.mod h1:oxjF8E3FBnjp+/gVFYdWacaLDx9na1aqy9oovLpxQYg= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= @@ -1247,8 +1254,8 @@ google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlba google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= -google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= -google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= +google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= @@ -1305,6 +1312,7 @@ gorm.io/gorm v1.22.5/go.mod h1:l2lP/RyAtc1ynaTjFksBde/O8v9oOGIApu2/xRitmZk= gorm.io/plugin/dbresolver v1.1.0 h1:cegr4DeprR6SkLIQlKhJLYxH8muFbJ4SmnojXvoeb00= gorm.io/plugin/dbresolver v1.1.0/go.mod h1:tpImigFAEejCALOttyhWqsy4vfa2Uh/vAUVnL5IRF7Y= gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= +gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/internal/dao/permission.go b/internal/dao/permission.go index b751886..6db6d04 100644 --- a/internal/dao/permission.go +++ b/internal/dao/permission.go @@ -113,6 +113,26 @@ func GetAccountProjectsByPermission(ctx context.Context, db bun.IDB, accountID, return aps, err } +func GetAccountProjectByPermission(ctx context.Context, db bun.IDB, accountID, organizationID, partnerID uuid.UUID, permission string) (models.AccountPermission, error) { + var aps models.AccountPermission + + sq := db.NewSelect().Model(&aps). + Where("account_id = ?", accountID). + Where("permission_name = ?", permission) + + if partnerID != uuid.Nil { + sq.Where("partner_id = ?", partnerID) + } + + if organizationID != uuid.Nil { + sq.Where("organization_id = ?", organizationID) + } + + err := sq.Limit(1).Scan(ctx) + + return aps, err +} + func GetDefaultAccountProject(ctx context.Context, db bun.IDB, accountID uuid.UUID) (models.AccountPermission, error) { var aps models.AccountPermission diff --git a/pkg/gateway/testdata/test.pb.go b/pkg/gateway/testdata/test.pb.go index 16dc69f..7c69164 100644 --- a/pkg/gateway/testdata/test.pb.go +++ b/pkg/gateway/testdata/test.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: pkg/gateway/testdata/test.proto diff --git a/pkg/gateway/testdata/test.pb.gw.go b/pkg/gateway/testdata/test.pb.gw.go index 5dfc4e2..a63cf44 100644 --- a/pkg/gateway/testdata/test.pb.gw.go +++ b/pkg/gateway/testdata/test.pb.gw.go @@ -32,7 +32,7 @@ var _ = utilities.NewDoubleArray var _ = metadata.Join var ( - filter_TestService_Get_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 4, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 2, 4, 2, 6, 3, 3}} + filter_TestService_Get_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 3, 1, 0, 3, 0}, Check: []int{0, 1, 2, 3, 2, 5}} ) func request_TestService_Get_0(ctx context.Context, marshaler runtime.Marshaler, client TestServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -158,21 +158,21 @@ func RegisterTestServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux // RegisterTestServiceHandlerFromEndpoint is same as RegisterTestServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterTestServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/pkg/service/const.go b/pkg/service/const.go index 38cc9fd..66b006b 100644 --- a/pkg/service/const.go +++ b/pkg/service/const.go @@ -13,4 +13,5 @@ const ( partnerR = "partner.read" organizationR = "organization.read" opsAll = "ops_star.all" + cliConfigR = "cli.config.read" ) diff --git a/pkg/service/group_test.go b/pkg/service/group_test.go index 0157123..67a5367 100644 --- a/pkg/service/group_test.go +++ b/pkg/service/group_test.go @@ -46,8 +46,8 @@ func performGroupBasicAuthzChecks(t *testing.T, mazc mockAuthzClient, guuid stri if u.Obj != roles[i].Role { t.Errorf("invalid obj in policy sent to authz; expected '%v', got '%v'", roles[i].Role, u.Obj) } - if roles[i].Namespace != nil { - if u.Ns != fmt.Sprint(*roles[i].Namespace) { + if roles[i].Namespace != "" { + if u.Ns != fmt.Sprint(roles[i].Namespace) { t.Errorf("invalid ns in policy sent to authz; expected '%v', got '%v'", fmt.Sprint(roles[i].Namespace), u.Ns) } } else { @@ -55,8 +55,8 @@ func performGroupBasicAuthzChecks(t *testing.T, mazc mockAuthzClient, guuid stri t.Errorf("invalid ns in policy sent to authz; expected '%v', got '%v'", "*", u.Ns) } } - if roles[i].Project != nil { - if u.Proj != *roles[i].Project { + if roles[i].Project != "" { + if u.Proj != roles[i].Project { t.Errorf("invalid proj in policy sent to authz; expected '%v', got '%v'", roles[i].Project, u.Proj) } } else { @@ -229,7 +229,7 @@ func TestCreateGroupNoUsersWithRoles(t *testing.T) { WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(guuid)) mock.ExpectQuery(`SELECT "resourcerole"."id".* FROM "authsrv_resourcerole" AS "resourcerole"`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id", "name", "scope"}).AddRow(pruuid, "role-name", tc.scope)) - if tc.roles[0].Project != nil { + if tc.roles[0].Project != "" { mock.ExpectQuery(`SELECT "project"."id" FROM "authsrv_project" AS "project"`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(pruuid)) } @@ -277,10 +277,10 @@ func TestCreateGroupWithUsersWithRoles(t *testing.T) { shouldfail bool }{ {"just role", []string{"user-" + uuid.New().String()}, []*userv3.ProjectNamespaceRole{{Role: uuid.New().String()}}, "authsrv_grouprole", "system", false}, - {"just project", []string{"user-" + uuid.New().String()}, []*userv3.ProjectNamespaceRole{{Project: &projectid}}, "authsrv_grouprole", "system", true}, // no role creation without role - {"just namespace", []string{"user-" + uuid.New().String()}, []*userv3.ProjectNamespaceRole{{Namespace: &namespaceid}}, "authsrv_projectgrouprole", "project", true}, // no role creation without role, - {"project and namespace", []string{"user-" + uuid.New().String()}, []*userv3.ProjectNamespaceRole{{Project: &projectid, Namespace: &namespaceid}}, "authsrv_grouprole", "project", true}, // no role creation without role, - {"project and role", []string{"user-" + uuid.New().String()}, []*userv3.ProjectNamespaceRole{{Project: &projectid, Role: uuid.New().String()}}, "authsrv_projectgrouprole", "project", false}, + {"just project", []string{"user-" + uuid.New().String()}, []*userv3.ProjectNamespaceRole{{Project: projectid}}, "authsrv_grouprole", "system", true}, // no role creation without role + {"just namespace", []string{"user-" + uuid.New().String()}, []*userv3.ProjectNamespaceRole{{Namespace: namespaceid}}, "authsrv_projectgrouprole", "project", true}, // no role creation without role, + {"project and namespace", []string{"user-" + uuid.New().String()}, []*userv3.ProjectNamespaceRole{{Project: projectid, Namespace: namespaceid}}, "authsrv_grouprole", "project", true}, // no role creation without role, + {"project and role", []string{"user-" + uuid.New().String()}, []*userv3.ProjectNamespaceRole{{Project: projectid, Role: uuid.New().String()}}, "authsrv_projectgrouprole", "project", false}, // {"project role namespace", []string{"user-" + uuid.New().String()}, []*userv3.ProjectNamespaceRole{{Project: &projectid, Namespace: &namespaceid, Role: uuid.New().String()}}, "authsrv_projectgroupnamespacerole", false}, } for _, tc := range tt { @@ -310,7 +310,7 @@ func TestCreateGroupWithUsersWithRoles(t *testing.T) { mock.ExpectQuery(`SELECT "resourcerole"."id".* FROM "authsrv_resourcerole" AS "resourcerole"`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id", "name", "scope"}).AddRow(pruuid, "role-name", tc.scope)) - if tc.roles[0].Project != nil { + if tc.roles[0].Project != "" { mock.ExpectQuery(`SELECT "project"."id" FROM "authsrv_project" AS "project"`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(pruuid)) } @@ -390,7 +390,7 @@ func TestUpdateGroupWithUsersWithRoles(t *testing.T) { addGroupRoleMappingsUpdateExpectation(mock, guuid) mock.ExpectQuery(`SELECT "resourcerole"."id".* FROM "authsrv_resourcerole" AS "resourcerole"`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id", "name", "scope"}).AddRow(pruuid, "role-name", tc.scope)) - if tc.roles[0].Project != nil { + if tc.roles[0].Project != "" { mock.ExpectQuery(`SELECT "project"."id" FROM "authsrv_project" AS "project"`). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(pruuid)) } diff --git a/pkg/service/project.go b/pkg/service/project.go index 205b99b..deaf768 100644 --- a/pkg/service/project.go +++ b/pkg/service/project.go @@ -488,7 +488,7 @@ func (s *projectService) createGroupRoleRelations(ctx context.Context, db bun.ID } grp := pnr.Group - entity, err = dao.GetIdByName(ctx, s.db, *grp, &models.Group{}) + entity, err = dao.GetIdByName(ctx, s.db, grp, &models.Group{}) if err != nil { return &systemv3.Project{}, fmt.Errorf("unable to find group '%v'", grp) } @@ -498,7 +498,7 @@ func (s *projectService) createGroupRoleRelations(ctx context.Context, db bun.ID } else { return &systemv3.Project{}, fmt.Errorf("unable to find group '%v'", grp) } - grpName := *grp + grpName := grp org := project.Metadata.Organization switch scope { diff --git a/pkg/service/project_test.go b/pkg/service/project_test.go index 856cd86..15a88f4 100644 --- a/pkg/service/project_test.go +++ b/pkg/service/project_test.go @@ -50,8 +50,8 @@ func TestCreateProject(t *testing.T) { ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{ { Role: "PROJECT_READ_ONLY", - Project: &name, - Group: &group, + Project: name, + Group: group, }, }, }, @@ -118,7 +118,7 @@ func TestCreateProjectFull(t *testing.T) { Metadata: &v3.Metadata{Id: puuid, Name: "project-" + puuid, Organization: "orgname"}, Spec: &systemv3.ProjectSpec{ ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{ - {Project: &te[0], Namespace: &te[1], Group: &te[2], Role: te[3]}, + {Project: te[0], Namespace: te[1], Group: te[2], Role: te[3]}, }, UserRoles: []*userv3.UserRole{ {User: te[4], Role: te[3]}, @@ -360,11 +360,11 @@ func TestProjectList(t *testing.T) { if pl.Items[0].Metadata.Name != "project-"+uid { t.Errorf("incorrect project name; expected '%v', got '%v'", "project-"+uid, pl.Items[0].Metadata.Name) } - if *pl.Items[0].Spec.ProjectNamespaceRoles[0].Project != "test-project1" { - t.Errorf("incorrect projectnamespacerole; expected '%v', got '%v'", "test-project1", *pl.Items[0].Spec.ProjectNamespaceRoles[0].Project) + if pl.Items[0].Spec.ProjectNamespaceRoles[0].Project != "test-project1" { + t.Errorf("incorrect projectnamespacerole; expected '%v', got '%v'", "test-project1", pl.Items[0].Spec.ProjectNamespaceRoles[0].Project) } - if *pl.Items[0].Spec.ProjectNamespaceRoles[1].Namespace != "test-namespace2" { - t.Errorf("incorrect projectnamespacerole; expected '%v', got '%v'", "test-namespace2", *pl.Items[0].Spec.ProjectNamespaceRoles[1].Namespace) + if pl.Items[0].Spec.ProjectNamespaceRoles[1].Namespace != "test-namespace2" { + t.Errorf("incorrect projectnamespacerole; expected '%v', got '%v'", "test-namespace2", pl.Items[0].Spec.ProjectNamespaceRoles[1].Namespace) } if pl.Items[0].Spec.UserRoles[0].User != "test-user3" { t.Errorf("incorrect userrole; expected '%v', got '%v'", "test-user3", pl.Items[0].Spec.UserRoles[0].User) @@ -419,12 +419,12 @@ func TestProjectListNonDev(t *testing.T) { t.Errorf("incorrect project name; expected '%v', got '%v'", "project-"+uid, pl.Items[0].Metadata.Name) } - if *pl.Items[0].Spec.ProjectNamespaceRoles[0].Project != "test-project1" { - t.Errorf("incorrect projectnamespacerole; expected '%v', got '%v'", "test-project1", *pl.Items[0].Spec.ProjectNamespaceRoles[0].Project) + if pl.Items[0].Spec.ProjectNamespaceRoles[0].Project != "test-project1" { + t.Errorf("incorrect projectnamespacerole; expected '%v', got '%v'", "test-project1", pl.Items[0].Spec.ProjectNamespaceRoles[0].Project) } - if *pl.Items[0].Spec.ProjectNamespaceRoles[1].Namespace != "test-namespace2" { - t.Errorf("incorrect projectnamespacerole; expected '%v', got '%v'", "test-namespace2", *pl.Items[0].Spec.ProjectNamespaceRoles[1].Namespace) + if pl.Items[0].Spec.ProjectNamespaceRoles[1].Namespace != "test-namespace2" { + t.Errorf("incorrect projectnamespacerole; expected '%v', got '%v'", "test-namespace2", pl.Items[0].Spec.ProjectNamespaceRoles[1].Namespace) } if pl.Items[0].Spec.UserRoles[0].User != "test-user3" { diff --git a/pkg/service/test_utils.go b/pkg/service/test_utils.go index 7ff5dcc..e73e6c5 100644 --- a/pkg/service/test_utils.go +++ b/pkg/service/test_utils.go @@ -60,9 +60,9 @@ func idname(uid string, resource string) string { return resource + "-" + uid } -func idnamea(uid string, resource string) *string { +func idnamea(uid string, resource string) string { name := resource + "-" + uid - return &name + return name } func addFetchEmptyExpecteation(mock sqlmock.Sqlmock, resource string) { diff --git a/pkg/service/user.go b/pkg/service/user.go index 176bd41..024329d 100644 --- a/pkg/service/user.go +++ b/pkg/service/user.go @@ -22,7 +22,6 @@ import ( userrpcv3 "github.com/paralus/paralus/proto/rpc/user" authzv1 "github.com/paralus/paralus/proto/types/authz" commonv3 "github.com/paralus/paralus/proto/types/commonpb/v3" - v3 "github.com/paralus/paralus/proto/types/commonpb/v3" userv3 "github.com/paralus/paralus/proto/types/userpb/v3" ) @@ -511,7 +510,7 @@ func (s *userService) identitiesModelToUser(ctx context.Context, db bun.IDB, use roles = append(roles, allAssociatedRoles...) user.ApiVersion = apiVersion user.Kind = userKind - user.Metadata = &v3.Metadata{ + user.Metadata = &commonv3.Metadata{ Name: traits.Email, Labels: labels, ModifiedAt: timestamppb.New(usr.UpdatedAt), @@ -655,7 +654,7 @@ func (s *userService) GetUserInfo(ctx context.Context, user *userv3.User) (*user Namespace: p.Namespace, Role: p.Role, Permissions: rps, - Scope: &scope, + Scope: scope, }, ) @@ -857,12 +856,12 @@ func (s *userService) List(ctx context.Context, opts ...query.Option) (*userv3.U userList := &userv3.UserList{ ApiVersion: apiVersion, Kind: userListKind, - Metadata: &v3.ListMetadata{ + Metadata: &commonv3.ListMetadata{ Count: 0, }, } - queryOptions := v3.QueryOptions{} + queryOptions := commonv3.QueryOptions{} for _, opt := range opts { opt(&queryOptions) } @@ -960,7 +959,7 @@ func (s *userService) List(ctx context.Context, opts ...query.Option) (*userv3.U } // update the list metadata and items response - userList.Metadata = &v3.ListMetadata{ + userList.Metadata = &commonv3.ListMetadata{ Count: int64(len(users)), } userList.Items = users @@ -972,7 +971,19 @@ func (s *userService) RetrieveCliConfig(ctx context.Context, req *userrpcv3.ApiK // get the default project associated to this account ap, err := dao.GetDefaultAccountProject(ctx, s.db, uuid.MustParse(req.Id)) if err != nil { - return nil, err + _log.Debug("unable to fetch account permissions for default project, looking further..") + organizationID := ap.OrganizationId + if len(req.OrganizationId) > 0 { + organizationID = uuid.MustParse(req.OrganizationId) + } + partnerID := ap.PartnerId + if len(req.PartnerId) > 0 { + partnerID = uuid.MustParse(req.PartnerId) + } + ap, err = dao.GetAccountProjectByPermission(ctx, s.db, uuid.MustParse(req.Id), organizationID, partnerID, cliConfigR) + if err != nil { + return nil, err + } } // fetch the metadata information required to populate cli config var proj models.Project @@ -1063,7 +1074,7 @@ func (s *userService) UpdateIdpUserGroupPolicy(ctx context.Context, op, id, trai } } user = &userv3.User{ - Metadata: &v3.Metadata{ + Metadata: &commonv3.Metadata{ Name: userInfo.Email, }, Spec: &userv3.UserSpec{ diff --git a/pkg/service/user_test.go b/pkg/service/user_test.go index 5118936..3b1c30b 100644 --- a/pkg/service/user_test.go +++ b/pkg/service/user_test.go @@ -96,11 +96,11 @@ func TestCreateUserWithRole(t *testing.T) { } if tc.project { pruuid := addFetchIdExpectation(mock, "project") - role.Project = &pruuid + role.Project = pruuid } if tc.namespace { var ns = "ns" - role.Namespace = &ns + role.Namespace = ns } mock.ExpectQuery(fmt.Sprintf(`INSERT INTO "%v"`, tc.dbname)). WithArgs().WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(uuid.New().String())) @@ -156,7 +156,7 @@ func TestUpdateUser(t *testing.T) { var ns string = "ns" user := &userv3.User{ Metadata: &v3.Metadata{Partner: "partner-" + puuid, Organization: "org-" + ouuid, Name: "user-" + uuuid}, - Spec: &userv3.UserSpec{ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: &ns, Role: idname(ruuid, "role")}}}, + Spec: &userv3.UserSpec{ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: ns, Role: idname(ruuid, "role")}}}, } user, err := us.Update(context.Background(), user) if err != nil { @@ -197,7 +197,7 @@ func TestUpdateUserWithGroup(t *testing.T) { Metadata: &v3.Metadata{Partner: "partner-" + puuid, Organization: "org-" + ouuid, Name: "user-" + uuuid}, Spec: &userv3.UserSpec{ Groups: []string{"group"}, - ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: &ns, Role: idname(ruuid, "role")}}, + ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: ns, Role: idname(ruuid, "role")}}, }, } user, err := us.Update(context.Background(), user) @@ -240,7 +240,7 @@ func TestUpdateUserWithIdpGroupPassed(t *testing.T) { Metadata: &v3.Metadata{Partner: "partner-" + puuid, Organization: "org-" + ouuid, Name: "user-" + uuuid}, Spec: &userv3.UserSpec{ IdpGroups: []string{"group"}, - ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: &ns, Role: idname(ruuid, "role")}}, + ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: ns, Role: idname(ruuid, "role")}}, }, } user, err := us.Update(context.Background(), user) @@ -283,7 +283,7 @@ func TestUpdateUserWithIdpGroupFetched(t *testing.T) { Metadata: &v3.Metadata{Partner: "partner-" + puuid, Organization: "org-" + ouuid, Name: "user-" + uuuid}, Spec: &userv3.UserSpec{ IdpGroups: []string{"group"}, - ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: &ns, Role: idname(ruuid, "role")}}, + ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: ns, Role: idname(ruuid, "role")}}, }, } user, err := us.Update(context.Background(), user) @@ -322,7 +322,7 @@ func TestUpdateUserInvalid(t *testing.T) { Metadata: &v3.Metadata{Partner: "partner-" + puuid, Organization: "org-" + ouuid, Name: "user-" + uuuid}, Spec: &userv3.UserSpec{ IdpGroups: []string{"unnecessary"}, - ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: &ns, Role: idname(ruuid, "role")}}, + ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{{Project: idnamea(pruuid, "project"), Namespace: ns, Role: idname(ruuid, "role")}}, }, } user, err := us.Update(context.Background(), user) @@ -470,8 +470,8 @@ func TestUserGetInfo(t *testing.T) { if len(userinfo.Spec.Permissions[0].Permissions) != 2 { t.Errorf("incorrect number of permissions; expected '%v', got '%v'", 2, len(userinfo.Spec.Permissions[0].Permissions)) } - if len(*userinfo.Spec.Permissions[0].Scope) == 0 { - t.Errorf("incorrect scope for permissions; expected '%v', got '%v'", fakescope, *userinfo.Spec.Permissions[0].Scope) + if len(userinfo.Spec.Permissions[0].Scope) == 0 { + t.Errorf("incorrect scope for permissions; expected '%v', got '%v'", fakescope, userinfo.Spec.Permissions[0].Scope) } } diff --git a/proto/rpc/audit/auditlog.pb.go b/proto/rpc/audit/auditlog.pb.go index b82b0f1..3aa6701 100644 --- a/proto/rpc/audit/auditlog.pb.go +++ b/proto/rpc/audit/auditlog.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/audit/auditlog.proto diff --git a/proto/rpc/audit/auditlog.pb.gw.go b/proto/rpc/audit/auditlog.pb.gw.go index ced1382..379bc8f 100644 --- a/proto/rpc/audit/auditlog.pb.gw.go +++ b/proto/rpc/audit/auditlog.pb.gw.go @@ -32,7 +32,7 @@ var _ = utilities.NewDoubleArray var _ = metadata.Join var ( - filter_AuditLogService_GetAuditLog_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "urlScope": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_AuditLogService_GetAuditLog_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "urlScope": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_AuditLogService_GetAuditLog_0(ctx context.Context, marshaler runtime.Marshaler, client AuditLogServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -199,21 +199,21 @@ func RegisterAuditLogServiceHandlerServer(ctx context.Context, mux *runtime.Serv // RegisterAuditLogServiceHandlerFromEndpoint is same as RegisterAuditLogServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterAuditLogServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/audit/relayaudit.pb.go b/proto/rpc/audit/relayaudit.pb.go index 4ccc0a0..4a7bb94 100644 --- a/proto/rpc/audit/relayaudit.pb.go +++ b/proto/rpc/audit/relayaudit.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/audit/relayaudit.proto diff --git a/proto/rpc/audit/relayaudit.pb.gw.go b/proto/rpc/audit/relayaudit.pb.gw.go index f3d1a8d..a85c996 100644 --- a/proto/rpc/audit/relayaudit.pb.gw.go +++ b/proto/rpc/audit/relayaudit.pb.gw.go @@ -32,7 +32,7 @@ var _ = utilities.NewDoubleArray var _ = metadata.Join var ( - filter_RelayAuditService_GetRelayAudit_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "urlScope": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_RelayAuditService_GetRelayAudit_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "urlScope": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_RelayAuditService_GetRelayAudit_0(ctx context.Context, marshaler runtime.Marshaler, client RelayAuditServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -199,21 +199,21 @@ func RegisterRelayAuditServiceHandlerServer(ctx context.Context, mux *runtime.Se // RegisterRelayAuditServiceHandlerFromEndpoint is same as RegisterRelayAuditServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterRelayAuditServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/role/role.pb.go b/proto/rpc/role/role.pb.go index 4de6799..c301c1d 100644 --- a/proto/rpc/role/role.pb.go +++ b/proto/rpc/role/role.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/role/role.proto diff --git a/proto/rpc/role/role.pb.gw.go b/proto/rpc/role/role.pb.gw.go index 0c201f2..b9cda9d 100644 --- a/proto/rpc/role/role.pb.gw.go +++ b/proto/rpc/role/role.pb.gw.go @@ -36,11 +36,7 @@ func request_RoleService_CreateRole_0(ctx context.Context, marshaler runtime.Mar var protoReq rolev3_0.Role var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -80,11 +76,7 @@ func local_request_RoleService_CreateRole_0(ctx context.Context, marshaler runti var protoReq rolev3_0.Role var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +113,7 @@ func local_request_RoleService_CreateRole_0(ctx context.Context, marshaler runti } var ( - filter_RoleService_GetRoles_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2}, Base: []int{1, 4, 5, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 5, 2, 7, 3, 4}} + filter_RoleService_GetRoles_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_RoleService_GetRoles_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -211,7 +203,7 @@ func local_request_RoleService_GetRoles_0(ctx context.Context, marshaler runtime } var ( - filter_RoleService_GetRole_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 6, 7, 8, 9, 2, 0, 4, 0, 6, 0, 0, 0, 0}, Check: []int{0, 1, 1, 1, 1, 2, 6, 2, 8, 2, 10, 3, 4, 5}} + filter_RoleService_GetRole_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 2, 2, 2, 3, 4, 5}} ) func request_RoleService_GetRole_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -324,11 +316,7 @@ func request_RoleService_UpdateRole_0(ctx context.Context, marshaler runtime.Mar var protoReq rolev3_0.Role var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -378,11 +366,7 @@ func local_request_RoleService_UpdateRole_0(ctx context.Context, marshaler runti var protoReq rolev3_0.Role var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -429,7 +413,7 @@ func local_request_RoleService_UpdateRole_0(ctx context.Context, marshaler runti } var ( - filter_RoleService_DeleteRole_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 6, 7, 8, 9, 2, 0, 4, 0, 6, 0, 0, 0, 0}, Check: []int{0, 1, 1, 1, 1, 2, 6, 2, 8, 2, 10, 3, 4, 5}} + filter_RoleService_DeleteRole_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 2, 2, 2, 3, 4, 5}} ) func request_RoleService_DeleteRole_0(ctx context.Context, marshaler runtime.Marshaler, client RoleServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -675,21 +659,21 @@ func RegisterRoleServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux // RegisterRoleServiceHandlerFromEndpoint is same as RegisterRoleServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterRoleServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/role/rolepermission.pb.go b/proto/rpc/role/rolepermission.pb.go index 881275f..1830ff0 100644 --- a/proto/rpc/role/rolepermission.pb.go +++ b/proto/rpc/role/rolepermission.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/role/rolepermission.proto diff --git a/proto/rpc/role/rolepermission.pb.gw.go b/proto/rpc/role/rolepermission.pb.gw.go index af68a1a..22ea33e 100644 --- a/proto/rpc/role/rolepermission.pb.gw.go +++ b/proto/rpc/role/rolepermission.pb.gw.go @@ -105,21 +105,21 @@ func RegisterRolepermissionServiceHandlerServer(ctx context.Context, mux *runtim // RegisterRolepermissionServiceHandlerFromEndpoint is same as RegisterRolepermissionServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterRolepermissionServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/scheduler/cluster.pb.go b/proto/rpc/scheduler/cluster.pb.go index 09acfc3..ed84f2f 100644 --- a/proto/rpc/scheduler/cluster.pb.go +++ b/proto/rpc/scheduler/cluster.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/scheduler/cluster.proto diff --git a/proto/rpc/scheduler/cluster.pb.gw.go b/proto/rpc/scheduler/cluster.pb.gw.go index 5cf606a..b419dfb 100644 --- a/proto/rpc/scheduler/cluster.pb.gw.go +++ b/proto/rpc/scheduler/cluster.pb.gw.go @@ -37,11 +37,7 @@ func request_ClusterService_CreateCluster_0(ctx context.Context, marshaler runti var protoReq infrav3.Cluster var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -71,11 +67,7 @@ func local_request_ClusterService_CreateCluster_0(ctx context.Context, marshaler var protoReq infrav3.Cluster var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -102,7 +94,7 @@ func local_request_ClusterService_CreateCluster_0(ctx context.Context, marshaler } var ( - filter_ClusterService_GetClusters_0 = &utilities.DoubleArray{Encoding: map[string]int{"project": 0}, Base: []int{1, 2, 0, 0}, Check: []int{0, 1, 2, 2}} + filter_ClusterService_GetClusters_0 = &utilities.DoubleArray{Encoding: map[string]int{"project": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) func request_ClusterService_GetClusters_0(ctx context.Context, marshaler runtime.Marshaler, client ClusterServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -172,7 +164,7 @@ func local_request_ClusterService_GetClusters_0(ctx context.Context, marshaler r } var ( - filter_ClusterService_GetCluster_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "project": 1, "name": 2}, Base: []int{1, 4, 5, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 5, 2, 7, 3, 4}} + filter_ClusterService_GetCluster_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "project": 1, "name": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_ClusterService_GetCluster_0(ctx context.Context, marshaler runtime.Marshaler, client ClusterServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -265,11 +257,7 @@ func request_ClusterService_UpdateCluster_0(ctx context.Context, marshaler runti var protoReq infrav3.Cluster var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -309,11 +297,7 @@ func local_request_ClusterService_UpdateCluster_0(ctx context.Context, marshaler var protoReq infrav3.Cluster var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -350,7 +334,7 @@ func local_request_ClusterService_UpdateCluster_0(ctx context.Context, marshaler } var ( - filter_ClusterService_DeleteCluster_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "project": 1, "name": 2}, Base: []int{1, 4, 5, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 5, 2, 7, 3, 4}} + filter_ClusterService_DeleteCluster_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "project": 1, "name": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_ClusterService_DeleteCluster_0(ctx context.Context, marshaler runtime.Marshaler, client ClusterServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -440,7 +424,7 @@ func local_request_ClusterService_DeleteCluster_0(ctx context.Context, marshaler } var ( - filter_ClusterService_DownloadCluster_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "project": 1, "name": 2}, Base: []int{1, 4, 5, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 5, 2, 7, 3, 4}} + filter_ClusterService_DownloadCluster_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "project": 1, "name": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_ClusterService_DownloadCluster_0(ctx context.Context, marshaler runtime.Marshaler, client ClusterServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -533,11 +517,7 @@ func request_ClusterService_UpdateClusterStatus_0(ctx context.Context, marshaler var protoReq UpdateClusterStatusRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -577,11 +557,7 @@ func local_request_ClusterService_UpdateClusterStatus_0(ctx context.Context, mar var protoReq UpdateClusterStatusRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -618,7 +594,7 @@ func local_request_ClusterService_UpdateClusterStatus_0(ctx context.Context, mar } var ( - filter_ClusterService_GetClusterStatus_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "project": 1, "name": 2}, Base: []int{1, 4, 5, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 5, 2, 7, 3, 4}} + filter_ClusterService_GetClusterStatus_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "project": 1, "name": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_ClusterService_GetClusterStatus_0(ctx context.Context, marshaler runtime.Marshaler, client ClusterServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -919,21 +895,21 @@ func RegisterClusterServiceHandlerServer(ctx context.Context, mux *runtime.Serve // RegisterClusterServiceHandlerFromEndpoint is same as RegisterClusterServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterClusterServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/sentry/audit_info.pb.go b/proto/rpc/sentry/audit_info.pb.go index 9180664..029751d 100644 --- a/proto/rpc/sentry/audit_info.pb.go +++ b/proto/rpc/sentry/audit_info.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/sentry/audit_info.proto diff --git a/proto/rpc/sentry/audit_info.pb.gw.go b/proto/rpc/sentry/audit_info.pb.gw.go index 668e2b0..d9147d9 100644 --- a/proto/rpc/sentry/audit_info.pb.gw.go +++ b/proto/rpc/sentry/audit_info.pb.gw.go @@ -165,21 +165,21 @@ func RegisterAuditInformationServiceHandlerServer(ctx context.Context, mux *runt // RegisterAuditInformationServiceHandlerFromEndpoint is same as RegisterAuditInformationServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterAuditInformationServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/sentry/bootstrap.pb.go b/proto/rpc/sentry/bootstrap.pb.go index 24d145d..fe1f5a6 100644 --- a/proto/rpc/sentry/bootstrap.pb.go +++ b/proto/rpc/sentry/bootstrap.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/sentry/bootstrap.proto diff --git a/proto/rpc/sentry/bootstrap.pb.gw.go b/proto/rpc/sentry/bootstrap.pb.gw.go index de7ff76..66ccb86 100644 --- a/proto/rpc/sentry/bootstrap.pb.gw.go +++ b/proto/rpc/sentry/bootstrap.pb.gw.go @@ -37,11 +37,7 @@ func request_BootstrapService_PatchBootstrapInfra_0(ctx context.Context, marshal var protoReq sentry_0.BootstrapInfra var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -71,11 +67,7 @@ func local_request_BootstrapService_PatchBootstrapInfra_0(ctx context.Context, m var protoReq sentry_0.BootstrapInfra var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -102,7 +94,7 @@ func local_request_BootstrapService_PatchBootstrapInfra_0(ctx context.Context, m } var ( - filter_BootstrapService_GetBootstrapInfra_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_BootstrapService_GetBootstrapInfra_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_BootstrapService_GetBootstrapInfra_0(ctx context.Context, marshaler runtime.Marshaler, client BootstrapServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -175,11 +167,7 @@ func request_BootstrapService_PatchBootstrapAgentTemplate_0(ctx context.Context, var protoReq sentry_0.BootstrapAgentTemplate var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -209,11 +197,7 @@ func local_request_BootstrapService_PatchBootstrapAgentTemplate_0(ctx context.Co var protoReq sentry_0.BootstrapAgentTemplate var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -240,7 +224,7 @@ func local_request_BootstrapService_PatchBootstrapAgentTemplate_0(ctx context.Co } var ( - filter_BootstrapService_GetBootstrapAgentTemplate_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_BootstrapService_GetBootstrapAgentTemplate_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_BootstrapService_GetBootstrapAgentTemplate_0(ctx context.Context, marshaler runtime.Marshaler, client BootstrapServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -349,11 +333,7 @@ func request_BootstrapService_RegisterBootstrapAgent_0(ctx context.Context, mars var protoReq RegisterAgentRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -383,11 +363,7 @@ func local_request_BootstrapService_RegisterBootstrapAgent_0(ctx context.Context var protoReq RegisterAgentRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -414,7 +390,7 @@ func local_request_BootstrapService_RegisterBootstrapAgent_0(ctx context.Context } var ( - filter_BootstrapService_GetBootstrapAgentConfig_0 = &utilities.DoubleArray{Encoding: map[string]int{"spec": 0, "templateRef": 1, "metadata": 2, "name": 3}, Base: []int{1, 4, 3, 5, 6, 2, 0, 0, 5, 0, 0}, Check: []int{0, 1, 1, 1, 1, 2, 6, 3, 4, 9, 5}} + filter_BootstrapService_GetBootstrapAgentConfig_0 = &utilities.DoubleArray{Encoding: map[string]int{"spec": 0, "templateRef": 1, "metadata": 2, "name": 3}, Base: []int{1, 1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 1, 4, 3, 5}} ) func request_BootstrapService_GetBootstrapAgentConfig_0(ctx context.Context, marshaler runtime.Marshaler, client BootstrapServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -507,11 +483,7 @@ func request_BootstrapService_CreateBootstrapAgent_0(ctx context.Context, marsha var protoReq sentry_0.BootstrapAgent var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -541,11 +513,7 @@ func local_request_BootstrapService_CreateBootstrapAgent_0(ctx context.Context, var protoReq sentry_0.BootstrapAgent var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -572,7 +540,7 @@ func local_request_BootstrapService_CreateBootstrapAgent_0(ctx context.Context, } var ( - filter_BootstrapService_GetBootstrapAgent_0 = &utilities.DoubleArray{Encoding: map[string]int{"spec": 0, "templateRef": 1, "metadata": 2, "name": 3}, Base: []int{1, 4, 3, 5, 6, 2, 0, 0, 5, 0, 0}, Check: []int{0, 1, 1, 1, 1, 2, 6, 3, 4, 9, 5}} + filter_BootstrapService_GetBootstrapAgent_0 = &utilities.DoubleArray{Encoding: map[string]int{"spec": 0, "templateRef": 1, "metadata": 2, "name": 3}, Base: []int{1, 1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 1, 4, 3, 5}} ) func request_BootstrapService_GetBootstrapAgent_0(ctx context.Context, marshaler runtime.Marshaler, client BootstrapServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -662,7 +630,7 @@ func local_request_BootstrapService_GetBootstrapAgent_0(ctx context.Context, mar } var ( - filter_BootstrapService_GetBootstrapAgents_0 = &utilities.DoubleArray{Encoding: map[string]int{"templateScope": 0}, Base: []int{1, 2, 0, 0}, Check: []int{0, 1, 2, 2}} + filter_BootstrapService_GetBootstrapAgents_0 = &utilities.DoubleArray{Encoding: map[string]int{"templateScope": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) func request_BootstrapService_GetBootstrapAgents_0(ctx context.Context, marshaler runtime.Marshaler, client BootstrapServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -732,7 +700,7 @@ func local_request_BootstrapService_GetBootstrapAgents_0(ctx context.Context, ma } var ( - filter_BootstrapService_DeleteBootstrapAgent_0 = &utilities.DoubleArray{Encoding: map[string]int{"spec": 0, "templateRef": 1, "metadata": 2, "name": 3}, Base: []int{1, 4, 3, 5, 6, 2, 0, 0, 5, 0, 0}, Check: []int{0, 1, 1, 1, 1, 2, 6, 3, 4, 9, 5}} + filter_BootstrapService_DeleteBootstrapAgent_0 = &utilities.DoubleArray{Encoding: map[string]int{"spec": 0, "templateRef": 1, "metadata": 2, "name": 3}, Base: []int{1, 1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 1, 4, 3, 5}} ) func request_BootstrapService_DeleteBootstrapAgent_0(ctx context.Context, marshaler runtime.Marshaler, client BootstrapServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -825,11 +793,7 @@ func request_BootstrapService_UpdateBootstrapAgent_0(ctx context.Context, marsha var protoReq sentry_0.BootstrapAgent var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -869,11 +833,7 @@ func local_request_BootstrapService_UpdateBootstrapAgent_0(ctx context.Context, var protoReq sentry_0.BootstrapAgent var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -1221,21 +1181,21 @@ func RegisterBootstrapServiceHandlerServer(ctx context.Context, mux *runtime.Ser // RegisterBootstrapServiceHandlerFromEndpoint is same as RegisterBootstrapServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterBootstrapServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/sentry/cluster_authz.pb.go b/proto/rpc/sentry/cluster_authz.pb.go index 7a9fa7c..5906184 100644 --- a/proto/rpc/sentry/cluster_authz.pb.go +++ b/proto/rpc/sentry/cluster_authz.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/sentry/cluster_authz.proto diff --git a/proto/rpc/sentry/cluster_authz.pb.gw.go b/proto/rpc/sentry/cluster_authz.pb.gw.go index fd17b14..ec17a72 100644 --- a/proto/rpc/sentry/cluster_authz.pb.gw.go +++ b/proto/rpc/sentry/cluster_authz.pb.gw.go @@ -104,21 +104,21 @@ func RegisterClusterAuthorizationServiceHandlerServer(ctx context.Context, mux * // RegisterClusterAuthorizationServiceHandlerFromEndpoint is same as RegisterClusterAuthorizationServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterClusterAuthorizationServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/sentry/kubeconfig.pb.go b/proto/rpc/sentry/kubeconfig.pb.go index 0e6101c..b276536 100644 --- a/proto/rpc/sentry/kubeconfig.pb.go +++ b/proto/rpc/sentry/kubeconfig.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/sentry/kubeconfig.proto diff --git a/proto/rpc/sentry/kubeconfig.pb.gw.go b/proto/rpc/sentry/kubeconfig.pb.gw.go index 8fd21a9..f7eb7e0 100644 --- a/proto/rpc/sentry/kubeconfig.pb.gw.go +++ b/proto/rpc/sentry/kubeconfig.pb.gw.go @@ -140,7 +140,7 @@ func local_request_KubeConfigService_GetForUser_0(ctx context.Context, marshaler } var ( - filter_KubeConfigService_GetForUser_1 = &utilities.DoubleArray{Encoding: map[string]int{"opts": 0, "urlScope": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_KubeConfigService_GetForUser_1 = &utilities.DoubleArray{Encoding: map[string]int{"opts": 0, "urlScope": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_KubeConfigService_GetForUser_1(ctx context.Context, marshaler runtime.Marshaler, client KubeConfigServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -213,11 +213,7 @@ func request_KubeConfigService_RevokeKubeconfig_0(ctx context.Context, marshaler var protoReq RevokeKubeconfigRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -230,11 +226,7 @@ func local_request_KubeConfigService_RevokeKubeconfig_0(ctx context.Context, mar var protoReq RevokeKubeconfigRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -247,11 +239,7 @@ func request_KubeConfigService_RevokeKubeconfig_1(ctx context.Context, marshaler var protoReq RevokeKubeconfigRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -281,11 +269,7 @@ func local_request_KubeConfigService_RevokeKubeconfig_1(ctx context.Context, mar var protoReq RevokeKubeconfigRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -312,7 +296,7 @@ func local_request_KubeConfigService_RevokeKubeconfig_1(ctx context.Context, mar } var ( - filter_KubeConfigService_GetOrganizationSetting_0 = &utilities.DoubleArray{Encoding: map[string]int{"opts": 0, "urlScope": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_KubeConfigService_GetOrganizationSetting_0 = &utilities.DoubleArray{Encoding: map[string]int{"opts": 0, "urlScope": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_KubeConfigService_GetOrganizationSetting_0(ctx context.Context, marshaler runtime.Marshaler, client KubeConfigServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -382,7 +366,7 @@ func local_request_KubeConfigService_GetOrganizationSetting_0(ctx context.Contex } var ( - filter_KubeConfigService_GetUserSetting_0 = &utilities.DoubleArray{Encoding: map[string]int{"opts": 0, "urlScope": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_KubeConfigService_GetUserSetting_0 = &utilities.DoubleArray{Encoding: map[string]int{"opts": 0, "urlScope": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_KubeConfigService_GetUserSetting_0(ctx context.Context, marshaler runtime.Marshaler, client KubeConfigServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -452,7 +436,7 @@ func local_request_KubeConfigService_GetUserSetting_0(ctx context.Context, marsh } var ( - filter_KubeConfigService_GetSSOUserSetting_0 = &utilities.DoubleArray{Encoding: map[string]int{"opts": 0, "urlScope": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_KubeConfigService_GetSSOUserSetting_0 = &utilities.DoubleArray{Encoding: map[string]int{"opts": 0, "urlScope": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_KubeConfigService_GetSSOUserSetting_0(ctx context.Context, marshaler runtime.Marshaler, client KubeConfigServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -525,11 +509,7 @@ func request_KubeConfigService_UpdateOrganizationSetting_0(ctx context.Context, var protoReq UpdateKubeconfigSettingRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -559,11 +539,7 @@ func local_request_KubeConfigService_UpdateOrganizationSetting_0(ctx context.Con var protoReq UpdateKubeconfigSettingRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -593,11 +569,7 @@ func request_KubeConfigService_UpdateUserSetting_0(ctx context.Context, marshale var protoReq UpdateKubeconfigSettingRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -627,11 +599,7 @@ func local_request_KubeConfigService_UpdateUserSetting_0(ctx context.Context, ma var protoReq UpdateKubeconfigSettingRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -661,11 +629,7 @@ func request_KubeConfigService_UpdateSSOUserSetting_0(ctx context.Context, marsh var protoReq UpdateKubeconfigSettingRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -695,11 +659,7 @@ func local_request_KubeConfigService_UpdateSSOUserSetting_0(ctx context.Context, var protoReq UpdateKubeconfigSettingRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -1037,21 +997,21 @@ func RegisterKubeConfigServiceHandlerServer(ctx context.Context, mux *runtime.Se // RegisterKubeConfigServiceHandlerFromEndpoint is same as RegisterKubeConfigServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterKubeConfigServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/sentry/kubectl_cluster.pb.go b/proto/rpc/sentry/kubectl_cluster.pb.go index f9f7bac..ce8db9e 100644 --- a/proto/rpc/sentry/kubectl_cluster.pb.go +++ b/proto/rpc/sentry/kubectl_cluster.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/sentry/kubectl_cluster.proto diff --git a/proto/rpc/sentry/kubectl_cluster.pb.gw.go b/proto/rpc/sentry/kubectl_cluster.pb.gw.go index 444955b..09ccad5 100644 --- a/proto/rpc/sentry/kubectl_cluster.pb.gw.go +++ b/proto/rpc/sentry/kubectl_cluster.pb.gw.go @@ -35,11 +35,7 @@ func request_KubectlClusterSettingsService_UpdateKubectlClusterSettings_0(ctx co var protoReq UpdateKubectlClusterSettingsRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -69,11 +65,7 @@ func local_request_KubectlClusterSettingsService_UpdateKubectlClusterSettings_0( var protoReq UpdateKubectlClusterSettingsRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -100,7 +92,7 @@ func local_request_KubectlClusterSettingsService_UpdateKubectlClusterSettings_0( } var ( - filter_KubectlClusterSettingsService_GetKubectlClusterSettings_0 = &utilities.DoubleArray{Encoding: map[string]int{"opts": 0, "urlScope": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_KubectlClusterSettingsService_GetKubectlClusterSettings_0 = &utilities.DoubleArray{Encoding: map[string]int{"opts": 0, "urlScope": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_KubectlClusterSettingsService_GetKubectlClusterSettings_0(ctx context.Context, marshaler runtime.Marshaler, client KubectlClusterSettingsServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -231,21 +223,21 @@ func RegisterKubectlClusterSettingsServiceHandlerServer(ctx context.Context, mux // RegisterKubectlClusterSettingsServiceHandlerFromEndpoint is same as RegisterKubectlClusterSettingsServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterKubectlClusterSettingsServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/sentry/relaypeer.pb.go b/proto/rpc/sentry/relaypeer.pb.go index 8e6ece8..30cfbb9 100644 --- a/proto/rpc/sentry/relaypeer.pb.go +++ b/proto/rpc/sentry/relaypeer.pb.go @@ -2,7 +2,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/sentry/relaypeer.proto diff --git a/proto/rpc/system/idp.pb.go b/proto/rpc/system/idp.pb.go index ff1f645..ac51c83 100644 --- a/proto/rpc/system/idp.pb.go +++ b/proto/rpc/system/idp.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/system/idp.proto diff --git a/proto/rpc/system/idp.pb.gw.go b/proto/rpc/system/idp.pb.gw.go index 65042e3..edba656 100644 --- a/proto/rpc/system/idp.pb.gw.go +++ b/proto/rpc/system/idp.pb.gw.go @@ -37,11 +37,7 @@ func request_IdpService_CreateIdp_0(ctx context.Context, marshaler runtime.Marsh var protoReq systemv3_0.Idp var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -54,11 +50,7 @@ func local_request_IdpService_CreateIdp_0(ctx context.Context, marshaler runtime var protoReq systemv3_0.Idp var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -68,7 +60,7 @@ func local_request_IdpService_CreateIdp_0(ctx context.Context, marshaler runtime } var ( - filter_IdpService_GetIdp_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_IdpService_GetIdp_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_IdpService_GetIdp_0(ctx context.Context, marshaler runtime.Marshaler, client IdpServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -159,11 +151,7 @@ func request_IdpService_UpdateIdp_0(ctx context.Context, marshaler runtime.Marsh var protoReq systemv3_0.Idp var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,11 +181,7 @@ func local_request_IdpService_UpdateIdp_0(ctx context.Context, marshaler runtime var protoReq systemv3_0.Idp var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -224,7 +208,7 @@ func local_request_IdpService_UpdateIdp_0(ctx context.Context, marshaler runtime } var ( - filter_IdpService_DeleteIdp_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_IdpService_DeleteIdp_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_IdpService_DeleteIdp_0(ctx context.Context, marshaler runtime.Marshaler, client IdpServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -430,21 +414,21 @@ func RegisterIdpServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux, // RegisterIdpServiceHandlerFromEndpoint is same as RegisterIdpServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterIdpServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/system/metro.pb.go b/proto/rpc/system/metro.pb.go index a5e1301..8ea3511 100644 --- a/proto/rpc/system/metro.pb.go +++ b/proto/rpc/system/metro.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/system/metro.proto diff --git a/proto/rpc/system/metro.pb.gw.go b/proto/rpc/system/metro.pb.gw.go index daadd90..d5f3186 100644 --- a/proto/rpc/system/metro.pb.gw.go +++ b/proto/rpc/system/metro.pb.gw.go @@ -36,11 +36,7 @@ func request_LocationService_CreateLocation_0(ctx context.Context, marshaler run var protoReq infrav3.Location var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -70,11 +66,7 @@ func local_request_LocationService_CreateLocation_0(ctx context.Context, marshal var protoReq infrav3.Location var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -101,7 +93,7 @@ func local_request_LocationService_CreateLocation_0(ctx context.Context, marshal } var ( - filter_LocationService_GetLocations_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_LocationService_GetLocations_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_LocationService_GetLocations_0(ctx context.Context, marshaler runtime.Marshaler, client LocationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -171,7 +163,7 @@ func local_request_LocationService_GetLocations_0(ctx context.Context, marshaler } var ( - filter_LocationService_GetLocation_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "name": 2}, Base: []int{1, 4, 5, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 5, 2, 7, 3, 4}} + filter_LocationService_GetLocation_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "name": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_LocationService_GetLocation_0(ctx context.Context, marshaler runtime.Marshaler, client LocationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -264,11 +256,7 @@ func request_LocationService_UpdateLocation_0(ctx context.Context, marshaler run var protoReq infrav3.Location var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -308,11 +296,7 @@ func local_request_LocationService_UpdateLocation_0(ctx context.Context, marshal var protoReq infrav3.Location var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -349,7 +333,7 @@ func local_request_LocationService_UpdateLocation_0(ctx context.Context, marshal } var ( - filter_LocationService_DeleteLocation_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "name": 2}, Base: []int{1, 4, 5, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 5, 2, 7, 3, 4}} + filter_LocationService_DeleteLocation_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "name": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_LocationService_DeleteLocation_0(ctx context.Context, marshaler runtime.Marshaler, client LocationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -575,21 +559,21 @@ func RegisterLocationServiceHandlerServer(ctx context.Context, mux *runtime.Serv // RegisterLocationServiceHandlerFromEndpoint is same as RegisterLocationServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterLocationServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/system/oidc_provider.pb.go b/proto/rpc/system/oidc_provider.pb.go index ab1e232..4ffe72f 100644 --- a/proto/rpc/system/oidc_provider.pb.go +++ b/proto/rpc/system/oidc_provider.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/system/oidc_provider.proto diff --git a/proto/rpc/system/oidc_provider.pb.gw.go b/proto/rpc/system/oidc_provider.pb.gw.go index a98f693..49d2b9d 100644 --- a/proto/rpc/system/oidc_provider.pb.gw.go +++ b/proto/rpc/system/oidc_provider.pb.gw.go @@ -37,11 +37,7 @@ func request_OIDCProviderService_CreateOIDCProvider_0(ctx context.Context, marsh var protoReq systemv3_0.OIDCProvider var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -54,11 +50,7 @@ func local_request_OIDCProviderService_CreateOIDCProvider_0(ctx context.Context, var protoReq systemv3_0.OIDCProvider var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -68,7 +60,7 @@ func local_request_OIDCProviderService_CreateOIDCProvider_0(ctx context.Context, } var ( - filter_OIDCProviderService_GetOIDCProvider_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_OIDCProviderService_GetOIDCProvider_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_OIDCProviderService_GetOIDCProvider_0(ctx context.Context, marshaler runtime.Marshaler, client OIDCProviderServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -159,11 +151,7 @@ func request_OIDCProviderService_UpdateOIDCProvider_0(ctx context.Context, marsh var protoReq systemv3_0.OIDCProvider var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -193,11 +181,7 @@ func local_request_OIDCProviderService_UpdateOIDCProvider_0(ctx context.Context, var protoReq systemv3_0.OIDCProvider var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -224,7 +208,7 @@ func local_request_OIDCProviderService_UpdateOIDCProvider_0(ctx context.Context, } var ( - filter_OIDCProviderService_DeleteOIDCProvider_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_OIDCProviderService_DeleteOIDCProvider_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_OIDCProviderService_DeleteOIDCProvider_0(ctx context.Context, marshaler runtime.Marshaler, client OIDCProviderServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -430,21 +414,21 @@ func RegisterOIDCProviderServiceHandlerServer(ctx context.Context, mux *runtime. // RegisterOIDCProviderServiceHandlerFromEndpoint is same as RegisterOIDCProviderServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterOIDCProviderServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/system/organization.pb.go b/proto/rpc/system/organization.pb.go index 27f6372..052c909 100644 --- a/proto/rpc/system/organization.pb.go +++ b/proto/rpc/system/organization.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/system/organization.proto diff --git a/proto/rpc/system/organization.pb.gw.go b/proto/rpc/system/organization.pb.gw.go index 078ac5c..ebdb729 100644 --- a/proto/rpc/system/organization.pb.gw.go +++ b/proto/rpc/system/organization.pb.gw.go @@ -36,11 +36,7 @@ func request_OrganizationService_CreateOrganization_0(ctx context.Context, marsh var protoReq systemv3_0.Organization var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -70,11 +66,7 @@ func local_request_OrganizationService_CreateOrganization_0(ctx context.Context, var protoReq systemv3_0.Organization var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -101,7 +93,7 @@ func local_request_OrganizationService_CreateOrganization_0(ctx context.Context, } var ( - filter_OrganizationService_GetOrganizations_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_OrganizationService_GetOrganizations_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_OrganizationService_GetOrganizations_0(ctx context.Context, marshaler runtime.Marshaler, client OrganizationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -171,7 +163,7 @@ func local_request_OrganizationService_GetOrganizations_0(ctx context.Context, m } var ( - filter_OrganizationService_GetOrganization_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "name": 2}, Base: []int{1, 4, 5, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 5, 2, 7, 3, 4}} + filter_OrganizationService_GetOrganization_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "name": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_OrganizationService_GetOrganization_0(ctx context.Context, marshaler runtime.Marshaler, client OrganizationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -264,11 +256,7 @@ func request_OrganizationService_UpdateOrganization_0(ctx context.Context, marsh var protoReq systemv3_0.Organization var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -308,11 +296,7 @@ func local_request_OrganizationService_UpdateOrganization_0(ctx context.Context, var protoReq systemv3_0.Organization var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -349,7 +333,7 @@ func local_request_OrganizationService_UpdateOrganization_0(ctx context.Context, } var ( - filter_OrganizationService_DeleteOrganization_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "name": 2}, Base: []int{1, 4, 5, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 5, 2, 7, 3, 4}} + filter_OrganizationService_DeleteOrganization_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "name": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_OrganizationService_DeleteOrganization_0(ctx context.Context, marshaler runtime.Marshaler, client OrganizationServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -575,21 +559,21 @@ func RegisterOrganizationServiceHandlerServer(ctx context.Context, mux *runtime. // RegisterOrganizationServiceHandlerFromEndpoint is same as RegisterOrganizationServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterOrganizationServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/system/partner.pb.go b/proto/rpc/system/partner.pb.go index 16f28b9..faf7024 100644 --- a/proto/rpc/system/partner.pb.go +++ b/proto/rpc/system/partner.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/system/partner.proto diff --git a/proto/rpc/system/partner.pb.gw.go b/proto/rpc/system/partner.pb.gw.go index 772f2b9..3b9c0d9 100644 --- a/proto/rpc/system/partner.pb.gw.go +++ b/proto/rpc/system/partner.pb.gw.go @@ -36,11 +36,7 @@ func request_PartnerService_CreatePartner_0(ctx context.Context, marshaler runti var protoReq systemv3_0.Partner var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -53,11 +49,7 @@ func local_request_PartnerService_CreatePartner_0(ctx context.Context, marshaler var protoReq systemv3_0.Partner var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -67,7 +59,7 @@ func local_request_PartnerService_CreatePartner_0(ctx context.Context, marshaler } var ( - filter_PartnerService_GetPartner_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_PartnerService_GetPartner_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_PartnerService_GetPartner_0(ctx context.Context, marshaler runtime.Marshaler, client PartnerServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -158,11 +150,7 @@ func request_PartnerService_UpdatePartner_0(ctx context.Context, marshaler runti var protoReq systemv3_0.Partner var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -192,11 +180,7 @@ func local_request_PartnerService_UpdatePartner_0(ctx context.Context, marshaler var protoReq systemv3_0.Partner var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -223,7 +207,7 @@ func local_request_PartnerService_UpdatePartner_0(ctx context.Context, marshaler } var ( - filter_PartnerService_DeletePartner_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_PartnerService_DeletePartner_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_PartnerService_DeletePartner_0(ctx context.Context, marshaler runtime.Marshaler, client PartnerServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -429,21 +413,21 @@ func RegisterPartnerServiceHandlerServer(ctx context.Context, mux *runtime.Serve // RegisterPartnerServiceHandlerFromEndpoint is same as RegisterPartnerServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterPartnerServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/system/project.pb.go b/proto/rpc/system/project.pb.go index d84e2c3..adc6bb6 100644 --- a/proto/rpc/system/project.pb.go +++ b/proto/rpc/system/project.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/system/project.proto diff --git a/proto/rpc/system/project.pb.gw.go b/proto/rpc/system/project.pb.gw.go index d466c50..d25b775 100644 --- a/proto/rpc/system/project.pb.gw.go +++ b/proto/rpc/system/project.pb.gw.go @@ -36,11 +36,7 @@ func request_ProjectService_CreateProject_0(ctx context.Context, marshaler runti var protoReq systemv3_0.Project var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -80,11 +76,7 @@ func local_request_ProjectService_CreateProject_0(ctx context.Context, marshaler var protoReq systemv3_0.Project var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -121,7 +113,7 @@ func local_request_ProjectService_CreateProject_0(ctx context.Context, marshaler } var ( - filter_ProjectService_GetProjects_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2}, Base: []int{1, 4, 5, 6, 2, 0, 4, 0, 0, 0}, Check: []int{0, 1, 1, 1, 2, 5, 2, 7, 3, 4}} + filter_ProjectService_GetProjects_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2}, Base: []int{1, 1, 1, 2, 0, 0}, Check: []int{0, 1, 2, 2, 3, 4}} ) func request_ProjectService_GetProjects_0(ctx context.Context, marshaler runtime.Marshaler, client ProjectServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -211,7 +203,7 @@ func local_request_ProjectService_GetProjects_0(ctx context.Context, marshaler r } var ( - filter_ProjectService_GetProject_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 6, 7, 8, 9, 2, 0, 4, 0, 6, 0, 0, 0, 0}, Check: []int{0, 1, 1, 1, 1, 2, 6, 2, 8, 2, 10, 3, 4, 5}} + filter_ProjectService_GetProject_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 2, 2, 2, 3, 4, 5}} ) func request_ProjectService_GetProject_0(ctx context.Context, marshaler runtime.Marshaler, client ProjectServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -324,11 +316,7 @@ func request_ProjectService_UpdateProject_0(ctx context.Context, marshaler runti var protoReq systemv3_0.Project var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -378,11 +366,7 @@ func local_request_ProjectService_UpdateProject_0(ctx context.Context, marshaler var protoReq systemv3_0.Project var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -429,7 +413,7 @@ func local_request_ProjectService_UpdateProject_0(ctx context.Context, marshaler } var ( - filter_ProjectService_DeleteProject_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 6, 7, 8, 9, 2, 0, 4, 0, 6, 0, 0, 0, 0}, Check: []int{0, 1, 1, 1, 1, 2, 6, 2, 8, 2, 10, 3, 4, 5}} + filter_ProjectService_DeleteProject_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 2, 2, 2, 3, 4, 5}} ) func request_ProjectService_DeleteProject_0(ctx context.Context, marshaler runtime.Marshaler, client ProjectServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -675,21 +659,21 @@ func RegisterProjectServiceHandlerServer(ctx context.Context, mux *runtime.Serve // RegisterProjectServiceHandlerFromEndpoint is same as RegisterProjectServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterProjectServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/user/group.pb.go b/proto/rpc/user/group.pb.go index 2529a0b..bb8bd37 100644 --- a/proto/rpc/user/group.pb.go +++ b/proto/rpc/user/group.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/user/group.proto diff --git a/proto/rpc/user/group.pb.gw.go b/proto/rpc/user/group.pb.gw.go index 142f5ca..8ad214d 100644 --- a/proto/rpc/user/group.pb.gw.go +++ b/proto/rpc/user/group.pb.gw.go @@ -37,11 +37,7 @@ func request_GroupService_CreateGroup_0(ctx context.Context, marshaler runtime.M var protoReq userv3_0.Group var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -81,11 +77,7 @@ func local_request_GroupService_CreateGroup_0(ctx context.Context, marshaler run var protoReq userv3_0.Group var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -122,7 +114,7 @@ func local_request_GroupService_CreateGroup_0(ctx context.Context, marshaler run } var ( - filter_GroupService_GetGroups_0 = &utilities.DoubleArray{Encoding: map[string]int{"partner": 0, "organization": 1}, Base: []int{1, 2, 4, 0, 0, 0, 0}, Check: []int{0, 1, 1, 2, 2, 3, 3}} + filter_GroupService_GetGroups_0 = &utilities.DoubleArray{Encoding: map[string]int{"partner": 0, "organization": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} ) func request_GroupService_GetGroups_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -212,7 +204,7 @@ func local_request_GroupService_GetGroups_0(ctx context.Context, marshaler runti } var ( - filter_GroupService_GetGroup_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 6, 7, 8, 9, 2, 0, 4, 0, 6, 0, 0, 0, 0}, Check: []int{0, 1, 1, 1, 1, 2, 6, 2, 8, 2, 10, 3, 4, 5}} + filter_GroupService_GetGroup_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 2, 2, 2, 3, 4, 5}} ) func request_GroupService_GetGroup_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -325,11 +317,7 @@ func request_GroupService_UpdateGroup_0(ctx context.Context, marshaler runtime.M var protoReq userv3_0.Group var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -379,11 +367,7 @@ func local_request_GroupService_UpdateGroup_0(ctx context.Context, marshaler run var protoReq userv3_0.Group var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -430,7 +414,7 @@ func local_request_GroupService_UpdateGroup_0(ctx context.Context, marshaler run } var ( - filter_GroupService_DeleteGroup_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 6, 7, 8, 9, 2, 0, 4, 0, 6, 0, 0, 0, 0}, Check: []int{0, 1, 1, 1, 1, 2, 6, 2, 8, 2, 10, 3, 4, 5}} + filter_GroupService_DeleteGroup_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "partner": 1, "organization": 2, "name": 3}, Base: []int{1, 1, 1, 2, 3, 0, 0, 0}, Check: []int{0, 1, 2, 2, 2, 3, 4, 5}} ) func request_GroupService_DeleteGroup_0(ctx context.Context, marshaler runtime.Marshaler, client GroupServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -676,21 +660,21 @@ func RegisterGroupServiceHandlerServer(ctx context.Context, mux *runtime.ServeMu // RegisterGroupServiceHandlerFromEndpoint is same as RegisterGroupServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterGroupServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/user/user.pb.go b/proto/rpc/user/user.pb.go index da494b4..0c46dd3 100644 --- a/proto/rpc/user/user.pb.go +++ b/proto/rpc/user/user.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/user/user.proto @@ -30,8 +30,10 @@ type ApiKeyRequest struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` - Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` + Username string `protobuf:"bytes,1,opt,name=username,proto3" json:"username,omitempty"` + Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"` + OrganizationId string `protobuf:"bytes,3,opt,name=organization_id,json=organizationId,proto3" json:"organization_id,omitempty"` + PartnerId string `protobuf:"bytes,4,opt,name=partner_id,json=partnerId,proto3" json:"partner_id,omitempty"` } func (x *ApiKeyRequest) Reset() { @@ -80,6 +82,20 @@ func (x *ApiKeyRequest) GetId() string { return "" } +func (x *ApiKeyRequest) GetOrganizationId() string { + if x != nil { + return x.OrganizationId + } + return "" +} + +func (x *ApiKeyRequest) GetPartnerId() string { + if x != nil { + return x.PartnerId + } + return "" +} + type ApiKeyResponse struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -554,203 +570,208 @@ var file_proto_rpc_user_user_proto_rawDesc = []byte{ 0x2f, 0x75, 0x73, 0x65, 0x72, 0x70, 0x62, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x24, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x70, 0x62, 0x2f, 0x76, 0x33, 0x2f, 0x63, - 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3b, 0x0a, 0x0d, 0x41, - 0x70, 0x69, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, - 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, - 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x22, 0xbc, 0x01, 0x0a, 0x0e, 0x41, 0x70, 0x69, - 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x6d, - 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x41, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, - 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, - 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x6d, 0x6f, 0x64, - 0x69, 0x66, 0x69, 0x65, 0x64, 0x41, 0x74, 0x12, 0x38, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, - 0x65, 0x64, 0x41, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, - 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, - 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, - 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, - 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, - 0x6b, 0x65, 0x79, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x58, 0x0a, 0x17, 0x55, 0x73, 0x65, 0x72, 0x4c, - 0x69, 0x73, 0x74, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, - 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, - 0x0b, 0x32, 0x27, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, - 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x70, 0x69, 0x4b, - 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, - 0x73, 0x22, 0x37, 0x0a, 0x19, 0x55, 0x73, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x67, 0x6f, 0x74, 0x50, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, - 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, - 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x22, 0x40, 0x0a, 0x1a, 0x55, 0x73, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x83, 0x01, 0x0a, 0x0d, + 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, + 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, + 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x27, 0x0a, 0x0f, 0x6f, 0x72, 0x67, + 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, + 0x28, 0x09, 0x52, 0x0e, 0x6f, 0x72, 0x67, 0x61, 0x6e, 0x69, 0x7a, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x49, 0x64, 0x12, 0x1d, 0x0a, 0x0a, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x5f, 0x69, 0x64, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x70, 0x61, 0x72, 0x74, 0x6e, 0x65, 0x72, 0x49, + 0x64, 0x22, 0xbc, 0x01, 0x0a, 0x0e, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3a, 0x0a, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, + 0x41, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, + 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, + 0x74, 0x61, 0x6d, 0x70, 0x52, 0x0a, 0x6d, 0x6f, 0x64, 0x69, 0x66, 0x69, 0x65, 0x64, 0x41, 0x74, + 0x12, 0x38, 0x0a, 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x67, 0x6f, 0x6f, 0x67, 0x6c, 0x65, 0x2e, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x62, 0x75, 0x66, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x52, + 0x09, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x41, 0x74, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, + 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x12, 0x0a, 0x04, + 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, + 0x22, 0x58, 0x0a, 0x17, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x69, 0x4b, + 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x3d, 0x0a, 0x05, 0x69, + 0x74, 0x65, 0x6d, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x70, 0x61, 0x72, + 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, + 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x73, 0x70, 0x6f, + 0x6e, 0x73, 0x65, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x22, 0x37, 0x0a, 0x19, 0x55, 0x73, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x67, 0x6f, 0x74, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x63, 0x6f, - 0x76, 0x65, 0x72, 0x79, 0x4c, 0x69, 0x6e, 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, - 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x1b, 0x0a, 0x19, - 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, - 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x43, 0x6c, 0x69, - 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x19, 0x0a, - 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, - 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x1a, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, - 0x74, 0x65, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, - 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x30, 0x0a, 0x15, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, - 0x6e, 0x41, 0x75, 0x64, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, - 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, - 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, 0x18, 0x0a, 0x16, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, - 0x67, 0x69, 0x6e, 0x41, 0x75, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x32, 0xb9, 0x0e, 0x0a, 0x0b, 0x55, 0x73, 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, - 0x12, 0x95, 0x01, 0x0a, 0x0f, 0x41, 0x75, 0x64, 0x69, 0x74, 0x4c, 0x6f, 0x67, 0x57, 0x65, 0x62, - 0x68, 0x6f, 0x6f, 0x6b, 0x12, 0x2e, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, - 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, - 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x41, 0x75, 0x64, 0x69, 0x74, 0x52, 0x65, 0x71, - 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, - 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, - 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x41, 0x75, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, - 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x21, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x3a, 0x01, 0x2a, - 0x22, 0x16, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, - 0x61, 0x75, 0x64, 0x69, 0x74, 0x6c, 0x6f, 0x67, 0x12, 0xa2, 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, - 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, - 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, - 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x1a, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, - 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, - 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x52, 0x92, 0x41, 0x36, 0x4a, 0x34, - 0x0a, 0x03, 0x32, 0x30, 0x31, 0x12, 0x2d, 0x0a, 0x2b, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, - 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x69, 0x73, 0x20, 0x63, - 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, - 0x6c, 0x6c, 0x79, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, 0x0e, 0x2f, - 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x12, 0x72, 0x0a, - 0x08, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x73, 0x12, 0x29, 0x2e, 0x70, 0x61, 0x72, 0x61, - 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x63, 0x6f, - 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4f, 0x70, 0x74, - 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x23, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, - 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x22, 0x16, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x10, 0x12, 0x0e, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, - 0x73, 0x12, 0x72, 0x0a, 0x07, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x70, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, + 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x75, 0x73, 0x65, 0x72, 0x6e, + 0x61, 0x6d, 0x65, 0x22, 0x40, 0x0a, 0x1a, 0x55, 0x73, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x67, 0x6f, + 0x74, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, + 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x4c, 0x69, 0x6e, + 0x6b, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, + 0x79, 0x4c, 0x69, 0x6e, 0x6b, 0x22, 0x1b, 0x0a, 0x19, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, + 0x65, 0x74, 0x65, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, + 0x73, 0x65, 0x22, 0x12, 0x0a, 0x10, 0x43, 0x6c, 0x69, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x22, 0x19, 0x0a, 0x17, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, + 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x22, 0x1a, 0x0a, 0x18, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x46, 0x6f, 0x72, 0x63, 0x65, + 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x30, 0x0a, + 0x15, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x41, 0x75, 0x64, 0x69, 0x74, 0x52, + 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x5f, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x22, + 0x18, 0x0a, 0x16, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x41, 0x75, 0x64, 0x69, + 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x32, 0xb9, 0x0e, 0x0a, 0x0b, 0x55, 0x73, + 0x65, 0x72, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x12, 0x95, 0x01, 0x0a, 0x0f, 0x41, 0x75, + 0x64, 0x69, 0x74, 0x4c, 0x6f, 0x67, 0x57, 0x65, 0x62, 0x68, 0x6f, 0x6f, 0x6b, 0x12, 0x2e, 0x2e, + 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, + 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, + 0x6e, 0x41, 0x75, 0x64, 0x69, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x2f, 0x2e, + 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, + 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x6f, 0x67, 0x69, + 0x6e, 0x41, 0x75, 0x64, 0x69, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x21, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1b, 0x3a, 0x01, 0x2a, 0x22, 0x16, 0x2f, 0x61, 0x75, 0x74, 0x68, + 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x61, 0x75, 0x64, 0x69, 0x74, 0x6c, 0x6f, + 0x67, 0x12, 0xa2, 0x01, 0x0a, 0x0a, 0x43, 0x72, 0x65, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, + 0x12, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, + 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, + 0x72, 0x1a, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x22, 0x52, 0x92, 0x41, 0x36, 0x4a, 0x34, 0x0a, 0x03, 0x32, 0x30, 0x31, 0x12, 0x2d, + 0x0a, 0x2b, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, + 0x75, 0x73, 0x65, 0x72, 0x20, 0x69, 0x73, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x65, 0x64, 0x20, + 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x2e, 0x82, 0xd3, 0xe4, + 0x93, 0x02, 0x13, 0x3a, 0x01, 0x2a, 0x22, 0x0e, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, + 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x12, 0x72, 0x0a, 0x08, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, + 0x72, 0x73, 0x12, 0x29, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, + 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, + 0x2e, 0x51, 0x75, 0x65, 0x72, 0x79, 0x4f, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x1a, 0x23, 0x2e, + 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, + 0x73, 0x74, 0x22, 0x16, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x10, 0x12, 0x0e, 0x2f, 0x61, 0x75, 0x74, + 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x73, 0x12, 0x72, 0x0a, 0x07, 0x47, 0x65, + 0x74, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, + 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, + 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x1a, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, + 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, + 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x25, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x12, + 0x1d, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x7b, + 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x6e, + 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x2e, + 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x1a, 0x23, + 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, + 0x6e, 0x66, 0x6f, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x13, 0x12, 0x11, 0x2f, 0x61, 0x75, + 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x78, + 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x1a, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, - 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x25, - 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x12, 0x1d, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, - 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x7b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, - 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x6e, 0x0a, 0x0b, 0x47, 0x65, 0x74, 0x55, 0x73, 0x65, 0x72, - 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, - 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x1a, 0x23, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, - 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, - 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x19, 0x82, 0xd3, 0xe4, 0x93, - 0x02, 0x13, 0x12, 0x11, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, - 0x72, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x78, 0x0a, 0x0a, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, - 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, - 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, - 0x55, 0x73, 0x65, 0x72, 0x1a, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, - 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x3a, 0x01, 0x2a, - 0x1a, 0x1d, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, - 0x7b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, - 0xe7, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x46, 0x6f, - 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x12, 0x30, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, - 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, - 0x76, 0x33, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, - 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x70, 0x61, 0x72, - 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, - 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x70, 0x64, 0x61, 0x74, 0x65, 0x46, 0x6f, 0x72, 0x63, 0x65, - 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x6a, 0x92, - 0x41, 0x49, 0x4a, 0x47, 0x0a, 0x03, 0x32, 0x30, 0x30, 0x12, 0x40, 0x0a, 0x3e, 0x52, 0x65, 0x74, - 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, - 0x66, 0x6f, 0x72, 0x63, 0x65, 0x72, 0x65, 0x73, 0x65, 0x74, 0x20, 0x66, 0x6c, 0x61, 0x67, 0x20, - 0x68, 0x61, 0x73, 0x20, 0x62, 0x65, 0x65, 0x6e, 0x20, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, - 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x20, 0x75, 0x6e, 0x73, 0x65, 0x74, 0x82, 0xd3, 0xe4, 0x93, 0x02, - 0x18, 0x3a, 0x01, 0x2a, 0x1a, 0x13, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, - 0x73, 0x65, 0x72, 0x2f, 0x72, 0x65, 0x73, 0x65, 0x74, 0x12, 0xc1, 0x01, 0x0a, 0x0a, 0x44, 0x65, - 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x12, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, - 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, - 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x1a, 0x32, 0x2e, 0x70, 0x61, 0x72, 0x61, - 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, - 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x70, - 0x69, 0x4b, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x5e, 0x92, - 0x41, 0x36, 0x4a, 0x34, 0x0a, 0x03, 0x32, 0x30, 0x34, 0x12, 0x2d, 0x0a, 0x2b, 0x52, 0x65, 0x74, - 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, - 0x69, 0x73, 0x20, 0x64, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x20, 0x73, 0x75, 0x63, 0x63, 0x65, - 0x73, 0x73, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x2a, 0x1d, - 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x7b, 0x6d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x82, 0x01, - 0x0a, 0x11, 0x44, 0x6f, 0x77, 0x6e, 0x6c, 0x6f, 0x61, 0x64, 0x43, 0x6c, 0x69, 0x43, 0x6f, 0x6e, - 0x66, 0x69, 0x67, 0x12, 0x29, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, - 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, - 0x69, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, - 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, - 0x70, 0x42, 0x6f, 0x64, 0x79, 0x22, 0x1b, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, - 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x63, 0x6f, 0x6e, 0x66, - 0x69, 0x67, 0x12, 0x95, 0x01, 0x0a, 0x0f, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x41, - 0x70, 0x69, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x26, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, - 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, - 0x2e, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, - 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, - 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, - 0x74, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, - 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x12, 0x20, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, - 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x7b, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, - 0x65, 0x7d, 0x2f, 0x61, 0x70, 0x69, 0x6b, 0x65, 0x79, 0x73, 0x12, 0x9e, 0x01, 0x0a, 0x11, 0x55, - 0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x73, - 0x12, 0x26, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, - 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x70, 0x69, 0x4b, 0x65, - 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x32, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, - 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, - 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x70, 0x69, - 0x4b, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2d, 0x82, 0xd3, - 0xe4, 0x93, 0x02, 0x27, 0x2a, 0x25, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, - 0x73, 0x65, 0x72, 0x2f, 0x7b, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x2f, 0x61, - 0x70, 0x69, 0x6b, 0x65, 0x79, 0x73, 0x2f, 0x7b, 0x69, 0x64, 0x7d, 0x12, 0xae, 0x01, 0x0a, 0x12, - 0x55, 0x73, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x67, 0x6f, 0x74, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, - 0x72, 0x64, 0x12, 0x32, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, + 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x22, 0x28, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x22, 0x3a, 0x01, 0x2a, 0x1a, 0x1d, 0x2f, 0x61, 0x75, 0x74, 0x68, + 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x7b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0xe7, 0x01, 0x0a, 0x14, 0x55, 0x70, 0x64, + 0x61, 0x74, 0x65, 0x55, 0x73, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, + 0x74, 0x12, 0x30, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, + 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x70, 0x64, 0x61, + 0x74, 0x65, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, + 0x65, 0x73, 0x74, 0x1a, 0x31, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, + 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x70, + 0x64, 0x61, 0x74, 0x65, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x6a, 0x92, 0x41, 0x49, 0x4a, 0x47, 0x0a, 0x03, 0x32, + 0x30, 0x30, 0x12, 0x40, 0x0a, 0x3e, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, + 0x68, 0x65, 0x6e, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x72, 0x65, + 0x73, 0x65, 0x74, 0x20, 0x66, 0x6c, 0x61, 0x67, 0x20, 0x68, 0x61, 0x73, 0x20, 0x62, 0x65, 0x65, + 0x6e, 0x20, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x6c, 0x79, 0x20, 0x75, + 0x6e, 0x73, 0x65, 0x74, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x18, 0x3a, 0x01, 0x2a, 0x1a, 0x13, 0x2f, + 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x72, 0x65, 0x73, + 0x65, 0x74, 0x12, 0xc1, 0x01, 0x0a, 0x0a, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x55, 0x73, 0x65, + 0x72, 0x12, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, + 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, + 0x65, 0x72, 0x1a, 0x32, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, - 0x72, 0x46, 0x6f, 0x72, 0x67, 0x6f, 0x74, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, - 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x33, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, - 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, - 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x67, 0x6f, 0x74, 0x50, 0x61, 0x73, 0x73, 0x77, - 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, - 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, - 0x65, 0x72, 0x2f, 0x7b, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x2f, 0x66, 0x6f, - 0x72, 0x67, 0x6f, 0x74, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0xf2, 0x04, 0x92, - 0x41, 0x93, 0x03, 0x12, 0x2d, 0x0a, 0x17, 0x55, 0x73, 0x65, 0x72, 0x20, 0x6d, 0x61, 0x6e, 0x61, - 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x0d, - 0x0a, 0x0b, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x20, 0x44, 0x65, 0x76, 0x32, 0x03, 0x32, - 0x2e, 0x30, 0x2a, 0x01, 0x02, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x79, 0x61, 0x6d, 0x6c, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, - 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, - 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x79, 0x61, 0x6d, 0x6c, 0x52, 0x50, 0x0a, - 0x03, 0x34, 0x30, 0x33, 0x12, 0x49, 0x0a, 0x47, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, - 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x64, - 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, 0x70, 0x65, 0x72, - 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x74, 0x6f, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, - 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, - 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, - 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, - 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, 0x04, 0x9a, 0x02, 0x01, 0x07, 0x5a, 0x55, 0x0a, 0x1f, - 0x0a, 0x0a, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x41, 0x75, 0x74, 0x68, 0x12, 0x11, 0x08, 0x02, - 0x1a, 0x0b, 0x58, 0x2d, 0x41, 0x50, 0x49, 0x2d, 0x4b, 0x45, 0x59, 0x49, 0x44, 0x20, 0x02, 0x0a, - 0x21, 0x0a, 0x0c, 0x41, 0x70, 0x69, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x41, 0x75, 0x74, 0x68, 0x12, - 0x11, 0x08, 0x02, 0x1a, 0x0b, 0x58, 0x2d, 0x41, 0x50, 0x49, 0x2d, 0x54, 0x4f, 0x4b, 0x45, 0x4e, - 0x20, 0x02, 0x0a, 0x0f, 0x0a, 0x09, 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, - 0x02, 0x08, 0x01, 0x62, 0x31, 0x0a, 0x0e, 0x0a, 0x0a, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x41, - 0x75, 0x74, 0x68, 0x12, 0x00, 0x0a, 0x10, 0x0a, 0x0c, 0x41, 0x70, 0x69, 0x54, 0x6f, 0x6b, 0x65, - 0x6e, 0x41, 0x75, 0x74, 0x68, 0x12, 0x00, 0x0a, 0x0d, 0x0a, 0x09, 0x42, 0x61, 0x73, 0x69, 0x63, - 0x41, 0x75, 0x74, 0x68, 0x12, 0x00, 0x0a, 0x1b, 0x63, 0x6f, 0x6d, 0x2e, 0x70, 0x61, 0x72, 0x61, + 0x72, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x73, 0x52, 0x65, + 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x5e, 0x92, 0x41, 0x36, 0x4a, 0x34, 0x0a, 0x03, 0x32, + 0x30, 0x34, 0x12, 0x2d, 0x0a, 0x2b, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, + 0x68, 0x65, 0x6e, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x69, 0x73, 0x20, 0x64, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x64, 0x20, 0x73, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x66, 0x75, 0x6c, 0x6c, 0x79, + 0x2e, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x1f, 0x2a, 0x1d, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, + 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x7b, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, + 0x2e, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x12, 0x82, 0x01, 0x0a, 0x11, 0x44, 0x6f, 0x77, 0x6e, 0x6c, + 0x6f, 0x61, 0x64, 0x43, 0x6c, 0x69, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x29, 0x2e, 0x70, + 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, + 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x43, 0x6c, 0x69, 0x43, 0x6f, 0x6e, 0x66, 0x69, 0x67, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x25, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, + 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, + 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x48, 0x74, 0x74, 0x70, 0x42, 0x6f, 0x64, 0x79, 0x22, 0x1b, + 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x15, 0x12, 0x13, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, + 0x2f, 0x63, 0x6c, 0x69, 0x2f, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x67, 0x12, 0x95, 0x01, 0x0a, 0x0f, + 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x73, 0x12, + 0x26, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, + 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, + 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x30, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, + 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, + 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, + 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x28, 0x82, 0xd3, 0xe4, 0x93, 0x02, + 0x22, 0x12, 0x20, 0x2f, 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, + 0x2f, 0x7b, 0x75, 0x73, 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x2f, 0x61, 0x70, 0x69, 0x6b, + 0x65, 0x79, 0x73, 0x12, 0x9e, 0x01, 0x0a, 0x11, 0x55, 0x73, 0x65, 0x72, 0x44, 0x65, 0x6c, 0x65, + 0x74, 0x65, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x73, 0x12, 0x26, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, - 0x2e, 0x76, 0x33, 0x42, 0x09, 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, - 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x61, 0x72, - 0x61, 0x6c, 0x75, 0x73, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2f, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x2f, 0x72, 0x70, 0x63, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x3b, 0x75, 0x73, 0x65, 0x72, - 0x76, 0x33, 0xa2, 0x02, 0x04, 0x50, 0x44, 0x52, 0x55, 0xaa, 0x02, 0x17, 0x50, 0x61, 0x72, 0x61, - 0x6c, 0x75, 0x73, 0x2e, 0x44, 0x65, 0x76, 0x2e, 0x52, 0x70, 0x63, 0x2e, 0x55, 0x73, 0x65, 0x72, - 0x2e, 0x56, 0x33, 0xca, 0x02, 0x17, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x5c, 0x44, 0x65, - 0x76, 0x5c, 0x52, 0x70, 0x63, 0x5c, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, 0xe2, 0x02, 0x23, - 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x5c, 0x44, 0x65, 0x76, 0x5c, 0x52, 0x70, 0x63, 0x5c, - 0x55, 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, - 0x61, 0x74, 0x61, 0xea, 0x02, 0x1b, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x3a, 0x3a, 0x44, - 0x65, 0x76, 0x3a, 0x3a, 0x52, 0x70, 0x63, 0x3a, 0x3a, 0x55, 0x73, 0x65, 0x72, 0x3a, 0x3a, 0x56, - 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x76, 0x33, 0x2e, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, + 0x74, 0x1a, 0x32, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, + 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, + 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x73, 0x52, 0x65, 0x73, + 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2d, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x27, 0x2a, 0x25, 0x2f, + 0x61, 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x7b, 0x75, 0x73, + 0x65, 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x2f, 0x61, 0x70, 0x69, 0x6b, 0x65, 0x79, 0x73, 0x2f, + 0x7b, 0x69, 0x64, 0x7d, 0x12, 0xae, 0x01, 0x0a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x46, 0x6f, 0x72, + 0x67, 0x6f, 0x74, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x12, 0x32, 0x2e, 0x70, 0x61, + 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, + 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x6f, 0x72, 0x67, 0x6f, 0x74, + 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, + 0x33, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x72, 0x70, + 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x46, 0x6f, + 0x72, 0x67, 0x6f, 0x74, 0x50, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x52, 0x65, 0x73, 0x70, + 0x6f, 0x6e, 0x73, 0x65, 0x22, 0x2f, 0x82, 0xd3, 0xe4, 0x93, 0x02, 0x29, 0x12, 0x27, 0x2f, 0x61, + 0x75, 0x74, 0x68, 0x2f, 0x76, 0x33, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x2f, 0x7b, 0x75, 0x73, 0x65, + 0x72, 0x6e, 0x61, 0x6d, 0x65, 0x7d, 0x2f, 0x66, 0x6f, 0x72, 0x67, 0x6f, 0x74, 0x70, 0x61, 0x73, + 0x73, 0x77, 0x6f, 0x72, 0x64, 0x42, 0xf2, 0x04, 0x92, 0x41, 0x93, 0x03, 0x12, 0x2d, 0x0a, 0x17, + 0x55, 0x73, 0x65, 0x72, 0x20, 0x6d, 0x61, 0x6e, 0x61, 0x67, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x20, + 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x22, 0x0d, 0x0a, 0x0b, 0x50, 0x61, 0x72, 0x61, 0x6c, + 0x75, 0x73, 0x20, 0x44, 0x65, 0x76, 0x32, 0x03, 0x32, 0x2e, 0x30, 0x2a, 0x01, 0x02, 0x32, 0x10, + 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x6a, 0x73, 0x6f, 0x6e, + 0x32, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x79, 0x61, + 0x6d, 0x6c, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, + 0x6a, 0x73, 0x6f, 0x6e, 0x3a, 0x10, 0x61, 0x70, 0x70, 0x6c, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, + 0x6e, 0x2f, 0x79, 0x61, 0x6d, 0x6c, 0x52, 0x50, 0x0a, 0x03, 0x34, 0x30, 0x33, 0x12, 0x49, 0x0a, + 0x47, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, 0x20, 0x74, + 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x64, 0x6f, 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, + 0x20, 0x68, 0x61, 0x76, 0x65, 0x20, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, + 0x20, 0x74, 0x6f, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x2e, 0x52, 0x3b, 0x0a, 0x03, 0x34, 0x30, 0x34, 0x12, + 0x34, 0x0a, 0x2a, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x77, 0x68, 0x65, 0x6e, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x20, 0x64, 0x6f, + 0x65, 0x73, 0x20, 0x6e, 0x6f, 0x74, 0x20, 0x65, 0x78, 0x69, 0x73, 0x74, 0x2e, 0x12, 0x06, 0x0a, + 0x04, 0x9a, 0x02, 0x01, 0x07, 0x5a, 0x55, 0x0a, 0x1f, 0x0a, 0x0a, 0x41, 0x70, 0x69, 0x4b, 0x65, + 0x79, 0x41, 0x75, 0x74, 0x68, 0x12, 0x11, 0x08, 0x02, 0x1a, 0x0b, 0x58, 0x2d, 0x41, 0x50, 0x49, + 0x2d, 0x4b, 0x45, 0x59, 0x49, 0x44, 0x20, 0x02, 0x0a, 0x21, 0x0a, 0x0c, 0x41, 0x70, 0x69, 0x54, + 0x6f, 0x6b, 0x65, 0x6e, 0x41, 0x75, 0x74, 0x68, 0x12, 0x11, 0x08, 0x02, 0x1a, 0x0b, 0x58, 0x2d, + 0x41, 0x50, 0x49, 0x2d, 0x54, 0x4f, 0x4b, 0x45, 0x4e, 0x20, 0x02, 0x0a, 0x0f, 0x0a, 0x09, 0x42, + 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x02, 0x08, 0x01, 0x62, 0x31, 0x0a, 0x0e, + 0x0a, 0x0a, 0x41, 0x70, 0x69, 0x4b, 0x65, 0x79, 0x41, 0x75, 0x74, 0x68, 0x12, 0x00, 0x0a, 0x10, + 0x0a, 0x0c, 0x41, 0x70, 0x69, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x41, 0x75, 0x74, 0x68, 0x12, 0x00, + 0x0a, 0x0d, 0x0a, 0x09, 0x42, 0x61, 0x73, 0x69, 0x63, 0x41, 0x75, 0x74, 0x68, 0x12, 0x00, 0x0a, + 0x1b, 0x63, 0x6f, 0x6d, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, + 0x2e, 0x72, 0x70, 0x63, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x55, 0x73, + 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x30, 0x67, 0x69, 0x74, 0x68, 0x75, + 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2f, 0x70, 0x61, + 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x72, 0x70, 0x63, 0x2f, + 0x75, 0x73, 0x65, 0x72, 0x3b, 0x75, 0x73, 0x65, 0x72, 0x76, 0x33, 0xa2, 0x02, 0x04, 0x50, 0x44, + 0x52, 0x55, 0xaa, 0x02, 0x17, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x44, 0x65, 0x76, + 0x2e, 0x52, 0x70, 0x63, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x2e, 0x56, 0x33, 0xca, 0x02, 0x17, 0x50, + 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x5c, 0x44, 0x65, 0x76, 0x5c, 0x52, 0x70, 0x63, 0x5c, 0x55, + 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, 0xe2, 0x02, 0x23, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, + 0x5c, 0x44, 0x65, 0x76, 0x5c, 0x52, 0x70, 0x63, 0x5c, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, + 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1b, 0x50, + 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x3a, 0x3a, 0x44, 0x65, 0x76, 0x3a, 0x3a, 0x52, 0x70, 0x63, + 0x3a, 0x3a, 0x55, 0x73, 0x65, 0x72, 0x3a, 0x3a, 0x56, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/proto/rpc/user/user.pb.gw.go b/proto/rpc/user/user.pb.gw.go index 09c9051..46d6798 100644 --- a/proto/rpc/user/user.pb.gw.go +++ b/proto/rpc/user/user.pb.gw.go @@ -37,11 +37,7 @@ func request_UserService_AuditLogWebhook_0(ctx context.Context, marshaler runtim var protoReq UserLoginAuditRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -54,11 +50,7 @@ func local_request_UserService_AuditLogWebhook_0(ctx context.Context, marshaler var protoReq UserLoginAuditRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -71,11 +63,7 @@ func request_UserService_CreateUser_0(ctx context.Context, marshaler runtime.Mar var protoReq userv3_0.User var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -88,11 +76,7 @@ func local_request_UserService_CreateUser_0(ctx context.Context, marshaler runti var protoReq userv3_0.User var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -138,7 +122,7 @@ func local_request_UserService_GetUsers_0(ctx context.Context, marshaler runtime } var ( - filter_UserService_GetUser_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_UserService_GetUser_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_UserService_GetUser_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -247,11 +231,7 @@ func request_UserService_UpdateUser_0(ctx context.Context, marshaler runtime.Mar var protoReq userv3_0.User var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -281,11 +261,7 @@ func local_request_UserService_UpdateUser_0(ctx context.Context, marshaler runti var protoReq userv3_0.User var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -315,11 +291,7 @@ func request_UserService_UpdateUserForceReset_0(ctx context.Context, marshaler r var protoReq UpdateForceResetRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -332,11 +304,7 @@ func local_request_UserService_UpdateUserForceReset_0(ctx context.Context, marsh var protoReq UpdateForceResetRequest var metadata runtime.ServerMetadata - newReader, berr := utilities.IOReaderFactory(req.Body) - if berr != nil { - return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", berr) - } - if err := marshaler.NewDecoder(newReader()).Decode(&protoReq); err != nil && err != io.EOF { + if err := marshaler.NewDecoder(req.Body).Decode(&protoReq); err != nil && err != io.EOF { return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) } @@ -346,7 +314,7 @@ func local_request_UserService_UpdateUserForceReset_0(ctx context.Context, marsh } var ( - filter_UserService_DeleteUser_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 2, 3, 2, 0, 0}, Check: []int{0, 1, 1, 2, 4, 3}} + filter_UserService_DeleteUser_0 = &utilities.DoubleArray{Encoding: map[string]int{"metadata": 0, "name": 1}, Base: []int{1, 1, 1, 0}, Check: []int{0, 1, 2, 3}} ) func request_UserService_DeleteUser_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -434,7 +402,7 @@ func local_request_UserService_DownloadCliConfig_0(ctx context.Context, marshale } var ( - filter_UserService_UserListApiKeys_0 = &utilities.DoubleArray{Encoding: map[string]int{"username": 0}, Base: []int{1, 2, 0, 0}, Check: []int{0, 1, 2, 2}} + filter_UserService_UserListApiKeys_0 = &utilities.DoubleArray{Encoding: map[string]int{"username": 0}, Base: []int{1, 1, 0}, Check: []int{0, 1, 2}} ) func request_UserService_UserListApiKeys_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { @@ -503,6 +471,10 @@ func local_request_UserService_UserListApiKeys_0(ctx context.Context, marshaler } +var ( + filter_UserService_UserDeleteApiKeys_0 = &utilities.DoubleArray{Encoding: map[string]int{"username": 0, "id": 1}, Base: []int{1, 1, 2, 0, 0}, Check: []int{0, 1, 1, 2, 3}} +) + func request_UserService_UserDeleteApiKeys_0(ctx context.Context, marshaler runtime.Marshaler, client UserServiceClient, req *http.Request, pathParams map[string]string) (proto.Message, runtime.ServerMetadata, error) { var protoReq ApiKeyRequest var metadata runtime.ServerMetadata @@ -534,6 +506,13 @@ func request_UserService_UserDeleteApiKeys_0(ctx context.Context, marshaler runt return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_UserDeleteApiKeys_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + msg, err := client.UserDeleteApiKeys(ctx, &protoReq, grpc.Header(&metadata.HeaderMD), grpc.Trailer(&metadata.TrailerMD)) return msg, metadata, err @@ -570,6 +549,13 @@ func local_request_UserService_UserDeleteApiKeys_0(ctx context.Context, marshale return nil, metadata, status.Errorf(codes.InvalidArgument, "type mismatch, parameter: %s, error: %v", "id", err) } + if err := req.ParseForm(); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + if err := runtime.PopulateQueryParameters(&protoReq, req.Form, filter_UserService_UserDeleteApiKeys_0); err != nil { + return nil, metadata, status.Errorf(codes.InvalidArgument, "%v", err) + } + msg, err := server.UserDeleteApiKeys(ctx, &protoReq) return msg, metadata, err @@ -939,21 +925,21 @@ func RegisterUserServiceHandlerServer(ctx context.Context, mux *runtime.ServeMux // RegisterUserServiceHandlerFromEndpoint is same as RegisterUserServiceHandler but // automatically dials to "endpoint" and closes the connection when "ctx" gets done. func RegisterUserServiceHandlerFromEndpoint(ctx context.Context, mux *runtime.ServeMux, endpoint string, opts []grpc.DialOption) (err error) { - conn, err := grpc.DialContext(ctx, endpoint, opts...) + conn, err := grpc.NewClient(endpoint, opts...) if err != nil { return err } defer func() { if err != nil { if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } return } go func() { <-ctx.Done() if cerr := conn.Close(); cerr != nil { - grpclog.Infof("Failed to close conn to %s: %v", endpoint, cerr) + grpclog.Errorf("Failed to close conn to %s: %v", endpoint, cerr) } }() }() diff --git a/proto/rpc/user/user.proto b/proto/rpc/user/user.proto index c667a15..7ed5310 100644 --- a/proto/rpc/user/user.proto +++ b/proto/rpc/user/user.proto @@ -67,6 +67,8 @@ option (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_swagger) = { message ApiKeyRequest { string username = 1; string id = 2; + string organization_id = 3; + string partner_id = 4; } message ApiKeyResponse { diff --git a/proto/rpc/v3/auth.pb.go b/proto/rpc/v3/auth.pb.go index b259429..3063578 100644 --- a/proto/rpc/v3/auth.pb.go +++ b/proto/rpc/v3/auth.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/rpc/v3/auth.proto diff --git a/proto/types/audit/audit.pb.go b/proto/types/audit/audit.pb.go index 3da4042..7f50bc1 100644 --- a/proto/types/audit/audit.pb.go +++ b/proto/types/audit/audit.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/audit/audit.proto diff --git a/proto/types/authz/authz.pb.go b/proto/types/authz/authz.pb.go index 3d99a50..95da18b 100644 --- a/proto/types/authz/authz.pb.go +++ b/proto/types/authz/authz.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/authz/authz.proto diff --git a/proto/types/commonpb/v3/artifacts.pb.go b/proto/types/commonpb/v3/artifacts.pb.go index 6adf46e..f960f08 100644 --- a/proto/types/commonpb/v3/artifacts.pb.go +++ b/proto/types/commonpb/v3/artifacts.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/commonpb/v3/artifacts.proto diff --git a/proto/types/commonpb/v3/auth.pb.go b/proto/types/commonpb/v3/auth.pb.go index f4e37ab..0068096 100644 --- a/proto/types/commonpb/v3/auth.pb.go +++ b/proto/types/commonpb/v3/auth.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/commonpb/v3/auth.proto diff --git a/proto/types/commonpb/v3/common.pb.go b/proto/types/commonpb/v3/common.pb.go index b6a0467..0cc6f17 100644 --- a/proto/types/commonpb/v3/common.pb.go +++ b/proto/types/commonpb/v3/common.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/commonpb/v3/common.proto diff --git a/proto/types/controller/cluster_controller.pb.go b/proto/types/controller/cluster_controller.pb.go index 5134941..09a23db 100644 --- a/proto/types/controller/cluster_controller.pb.go +++ b/proto/types/controller/cluster_controller.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/controller/cluster_controller.proto diff --git a/proto/types/infrapb/v3/cluster.pb.go b/proto/types/infrapb/v3/cluster.pb.go index e6653f8..f2c601f 100644 --- a/proto/types/infrapb/v3/cluster.pb.go +++ b/proto/types/infrapb/v3/cluster.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/infrapb/v3/cluster.proto diff --git a/proto/types/rolepb/v3/role.pb.go b/proto/types/rolepb/v3/role.pb.go index 4e47631..9f4fc5e 100644 --- a/proto/types/rolepb/v3/role.pb.go +++ b/proto/types/rolepb/v3/role.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/rolepb/v3/role.proto diff --git a/proto/types/rolepb/v3/rolepermission.pb.go b/proto/types/rolepb/v3/rolepermission.pb.go index 33b03a4..2e309b6 100644 --- a/proto/types/rolepb/v3/rolepermission.pb.go +++ b/proto/types/rolepb/v3/rolepermission.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/rolepb/v3/rolepermission.proto diff --git a/proto/types/scheduler/namespace.pb.go b/proto/types/scheduler/namespace.pb.go index 12878f0..dc8a364 100644 --- a/proto/types/scheduler/namespace.pb.go +++ b/proto/types/scheduler/namespace.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/scheduler/namespace.proto diff --git a/proto/types/sentry/account_permission.pb.go b/proto/types/sentry/account_permission.pb.go index 1bffe42..7b7f5b4 100644 --- a/proto/types/sentry/account_permission.pb.go +++ b/proto/types/sentry/account_permission.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/sentry/account_permission.proto diff --git a/proto/types/sentry/group_permission.pb.go b/proto/types/sentry/group_permission.pb.go index 7ce1749..458fab3 100644 --- a/proto/types/sentry/group_permission.pb.go +++ b/proto/types/sentry/group_permission.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/sentry/group_permission.proto diff --git a/proto/types/sentry/kubeconfig_setting.pb.go b/proto/types/sentry/kubeconfig_setting.pb.go index aeb2301..4865c6a 100644 --- a/proto/types/sentry/kubeconfig_setting.pb.go +++ b/proto/types/sentry/kubeconfig_setting.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/sentry/kubeconfig_setting.proto diff --git a/proto/types/sentry/kubectl_cluster_setting.pb.go b/proto/types/sentry/kubectl_cluster_setting.pb.go index 06acfc6..d6d0ec7 100644 --- a/proto/types/sentry/kubectl_cluster_setting.pb.go +++ b/proto/types/sentry/kubectl_cluster_setting.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/sentry/kubectl_cluster_setting.proto diff --git a/proto/types/sentry/sentry.pb.go b/proto/types/sentry/sentry.pb.go index 7bbc070..fb4a66e 100644 --- a/proto/types/sentry/sentry.pb.go +++ b/proto/types/sentry/sentry.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/sentry/sentry.proto diff --git a/proto/types/systempb/v3/idp.pb.go b/proto/types/systempb/v3/idp.pb.go index 255e44e..d19aad7 100644 --- a/proto/types/systempb/v3/idp.pb.go +++ b/proto/types/systempb/v3/idp.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/systempb/v3/idp.proto diff --git a/proto/types/systempb/v3/oidc_provider.pb.go b/proto/types/systempb/v3/oidc_provider.pb.go index 1564f9f..ebb90b2 100644 --- a/proto/types/systempb/v3/oidc_provider.pb.go +++ b/proto/types/systempb/v3/oidc_provider.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/systempb/v3/oidc_provider.proto diff --git a/proto/types/systempb/v3/organization.pb.go b/proto/types/systempb/v3/organization.pb.go index 8682b45..d60e7a2 100644 --- a/proto/types/systempb/v3/organization.pb.go +++ b/proto/types/systempb/v3/organization.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/systempb/v3/organization.proto diff --git a/proto/types/systempb/v3/partner.pb.go b/proto/types/systempb/v3/partner.pb.go index 8a11a8a..34f7515 100644 --- a/proto/types/systempb/v3/partner.pb.go +++ b/proto/types/systempb/v3/partner.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/systempb/v3/partner.proto diff --git a/proto/types/systempb/v3/project.pb.go b/proto/types/systempb/v3/project.pb.go index 6f2c10f..2f73299 100644 --- a/proto/types/systempb/v3/project.pb.go +++ b/proto/types/systempb/v3/project.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/systempb/v3/project.proto diff --git a/proto/types/userpb/v3/group.pb.go b/proto/types/userpb/v3/group.pb.go index f4e0d05..5f2a06e 100644 --- a/proto/types/userpb/v3/group.pb.go +++ b/proto/types/userpb/v3/group.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/userpb/v3/group.proto @@ -106,10 +106,10 @@ type ProjectNamespaceRole struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Project *string `protobuf:"bytes,1,opt,name=project,proto3,oneof" json:"project,omitempty"` - Namespace *string `protobuf:"bytes,2,opt,name=namespace,proto3,oneof" json:"namespace,omitempty"` - Role string `protobuf:"bytes,3,opt,name=role,proto3" json:"role,omitempty"` - Group *string `protobuf:"bytes,4,opt,name=group,proto3,oneof" json:"group,omitempty"` + Project string `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"` + Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"` + Role string `protobuf:"bytes,3,opt,name=role,proto3" json:"role,omitempty"` + Group string `protobuf:"bytes,4,opt,name=group,proto3" json:"group,omitempty"` } func (x *ProjectNamespaceRole) Reset() { @@ -145,15 +145,15 @@ func (*ProjectNamespaceRole) Descriptor() ([]byte, []int) { } func (x *ProjectNamespaceRole) GetProject() string { - if x != nil && x.Project != nil { - return *x.Project + if x != nil { + return x.Project } return "" } func (x *ProjectNamespaceRole) GetNamespace() string { - if x != nil && x.Namespace != nil { - return *x.Namespace + if x != nil { + return x.Namespace } return "" } @@ -166,8 +166,8 @@ func (x *ProjectNamespaceRole) GetRole() string { } func (x *ProjectNamespaceRole) GetGroup() string { - if x != nil && x.Group != nil { - return *x.Group + if x != nil { + return x.Group } return "" } @@ -177,11 +177,11 @@ type Permission struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Project *string `protobuf:"bytes,1,opt,name=project,proto3,oneof" json:"project,omitempty"` - Namespace *string `protobuf:"bytes,2,opt,name=namespace,proto3,oneof" json:"namespace,omitempty"` + Project string `protobuf:"bytes,1,opt,name=project,proto3" json:"project,omitempty"` + Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"` Role string `protobuf:"bytes,3,opt,name=role,proto3" json:"role,omitempty"` Permissions []string `protobuf:"bytes,4,rep,name=permissions,proto3" json:"permissions,omitempty"` - Scope *string `protobuf:"bytes,5,opt,name=scope,proto3,oneof" json:"scope,omitempty"` + Scope string `protobuf:"bytes,5,opt,name=scope,proto3" json:"scope,omitempty"` } func (x *Permission) Reset() { @@ -217,15 +217,15 @@ func (*Permission) Descriptor() ([]byte, []int) { } func (x *Permission) GetProject() string { - if x != nil && x.Project != nil { - return *x.Project + if x != nil { + return x.Project } return "" } func (x *Permission) GetNamespace() string { - if x != nil && x.Namespace != nil { - return *x.Namespace + if x != nil { + return x.Namespace } return "" } @@ -245,8 +245,8 @@ func (x *Permission) GetPermissions() []string { } func (x *Permission) GetScope() string { - if x != nil && x.Scope != nil { - return *x.Scope + if x != nil { + return x.Scope } return "" } @@ -432,119 +432,112 @@ var file_proto_types_userpb_v3_group_proto_rawDesc = []byte{ 0x34, 0x2a, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x32, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0xd2, 0x01, 0x0a, 0x61, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0xd2, 0x01, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0xd2, 0x01, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xd2, 0x01, - 0x04, 0x73, 0x70, 0x65, 0x63, 0x22, 0xd2, 0x02, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, - 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x34, + 0x04, 0x73, 0x70, 0x65, 0x63, 0x22, 0x9f, 0x02, 0x0a, 0x14, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, + 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x2f, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x15, 0x92, 0x41, 0x12, 0x2a, 0x07, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x32, 0x07, 0x50, - 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x48, 0x00, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, - 0x74, 0x88, 0x01, 0x01, 0x12, 0x3c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, - 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x19, 0x92, 0x41, 0x16, 0x2a, 0x09, 0x4e, 0x61, - 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x32, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x48, 0x01, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x88, - 0x01, 0x01, 0x12, 0x23, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, - 0x42, 0x0f, 0x92, 0x41, 0x0c, 0x2a, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x32, 0x04, 0x52, 0x6f, 0x6c, - 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x2c, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x11, 0x92, 0x41, 0x0e, 0x2a, 0x05, 0x47, 0x72, 0x6f, - 0x75, 0x70, 0x32, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x48, 0x02, 0x52, 0x05, 0x67, 0x72, 0x6f, - 0x75, 0x70, 0x88, 0x01, 0x01, 0x3a, 0x4f, 0x92, 0x41, 0x4c, 0x0a, 0x4a, 0x2a, 0x14, 0x50, 0x72, - 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, - 0x6c, 0x65, 0x32, 0x32, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x72, 0x6f, 0x6c, - 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20, - 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x70, 0x65, 0x72, 0x6d, - 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, - 0x63, 0x74, 0x42, 0x0c, 0x0a, 0x0a, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, - 0x42, 0x08, 0x0a, 0x06, 0x5f, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0xa8, 0x03, 0x0a, 0x0a, 0x50, - 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x34, 0x0a, 0x07, 0x70, 0x72, 0x6f, - 0x6a, 0x65, 0x63, 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x15, 0x92, 0x41, 0x12, 0x2a, - 0x07, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x32, 0x07, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, - 0x74, 0x48, 0x00, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x88, 0x01, 0x01, 0x12, - 0x3c, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12, + 0x37, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x19, 0x92, 0x41, 0x16, 0x2a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, - 0x63, 0x65, 0x32, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x48, 0x01, 0x52, - 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x88, 0x01, 0x01, 0x12, 0x23, 0x0a, - 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, 0x92, 0x41, 0x0c, - 0x2a, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x32, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, - 0x6c, 0x65, 0x12, 0x50, 0x0a, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x42, 0x2e, 0x92, 0x41, 0x2b, 0x2a, 0x0b, 0x50, 0x65, - 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x32, 0x1c, 0x50, 0x65, 0x72, 0x6d, 0x69, - 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, 0x65, 0x64, 0x20, - 0x62, 0x79, 0x20, 0x72, 0x6f, 0x6c, 0x65, 0x52, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x6a, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x4f, 0x92, 0x41, 0x4c, 0x2a, 0x05, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x32, - 0x43, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x20, 0x68, 0x6f, 0x6c, 0x64, 0x73, 0x20, 0x69, 0x6e, 0x66, - 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x62, 0x6f, 0x75, 0x74, 0x20, 0x6f, - 0x72, 0x67, 0x20, 0x77, 0x69, 0x64, 0x65, 0x2c, 0x20, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, - 0x20, 0x6f, 0x72, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20, 0x61, 0x63, - 0x63, 0x65, 0x73, 0x73, 0x48, 0x02, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x88, 0x01, 0x01, - 0x3a, 0x1f, 0x92, 0x41, 0x1c, 0x0a, 0x1a, 0x2a, 0x0b, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, - 0x69, 0x6f, 0x6e, 0x73, 0x32, 0x0b, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, - 0x73, 0x42, 0x0a, 0x0a, 0x08, 0x5f, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x42, 0x0c, 0x0a, - 0x0a, 0x5f, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x42, 0x08, 0x0a, 0x06, 0x5f, - 0x73, 0x63, 0x6f, 0x70, 0x65, 0x22, 0xda, 0x02, 0x0a, 0x09, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x53, - 0x70, 0x65, 0x63, 0x12, 0xb2, 0x01, 0x0a, 0x15, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, - 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, - 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, - 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, - 0x52, 0x6f, 0x6c, 0x65, 0x42, 0x4b, 0x92, 0x41, 0x48, 0x2a, 0x15, 0x50, 0x72, 0x6f, 0x6a, 0x65, - 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, - 0x32, 0x2f, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, - 0x70, 0x61, 0x63, 0x65, 0x2c, 0x20, 0x72, 0x6f, 0x6c, 0x65, 0x20, 0x61, 0x73, 0x73, 0x6f, 0x63, - 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x67, 0x72, 0x6f, 0x75, - 0x70, 0x52, 0x15, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x12, 0x39, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, - 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x42, 0x23, 0x92, 0x41, 0x20, 0x2a, 0x05, 0x55, 0x73, - 0x65, 0x72, 0x73, 0x32, 0x17, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x75, 0x73, 0x65, - 0x72, 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x05, 0x75, 0x73, - 0x65, 0x72, 0x73, 0x12, 0x2c, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x18, 0x92, 0x41, 0x15, 0x2a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x32, 0x0d, 0x54, 0x79, - 0x70, 0x65, 0x20, 0x6f, 0x66, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x04, 0x74, 0x79, 0x70, - 0x65, 0x3a, 0x2f, 0x92, 0x41, 0x2c, 0x0a, 0x2a, 0x2a, 0x13, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x20, - 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0x13, 0x47, - 0x72, 0x6f, 0x75, 0x70, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, - 0x6f, 0x6e, 0x22, 0xa9, 0x03, 0x0a, 0x09, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4c, 0x69, 0x73, 0x74, - 0x12, 0x5a, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x3a, 0x92, 0x41, 0x37, 0x2a, 0x0b, 0x41, 0x50, 0x49, 0x20, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x26, 0x41, 0x50, 0x49, 0x20, 0x56, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x20, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x40, 0x01, - 0x52, 0x0a, 0x61, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x40, 0x0a, 0x04, - 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x2c, 0x92, 0x41, 0x29, 0x2a, - 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x32, 0x1f, 0x4b, 0x69, 0x6e, 0x64, 0x20, 0x6f, 0x66, 0x20, 0x74, - 0x68, 0x65, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x72, 0x65, - 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x40, 0x01, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x7b, - 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x29, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x34, 0x92, 0x41, 0x31, - 0x2a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x32, 0x23, 0x4d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x67, 0x72, 0x6f, 0x75, - 0x70, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x40, - 0x01, 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x61, 0x0a, 0x05, 0x69, - 0x74, 0x65, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x70, 0x61, 0x72, - 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, - 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x29, 0x92, 0x41, - 0x26, 0x2a, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x32, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x6f, - 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x72, 0x65, 0x73, 0x6f, - 0x75, 0x72, 0x63, 0x65, 0x73, 0x40, 0x01, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x3a, 0x1e, - 0x92, 0x41, 0x1b, 0x0a, 0x19, 0x2a, 0x09, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4c, 0x69, 0x73, 0x74, - 0x32, 0x0a, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x40, 0x01, 0x42, 0xed, - 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, + 0x63, 0x65, 0x32, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, 0x6e, + 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x12, 0x23, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, + 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, 0x92, 0x41, 0x0c, 0x2a, 0x04, 0x52, 0x6f, 0x6c, + 0x65, 0x32, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x27, 0x0a, + 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x42, 0x11, 0x92, 0x41, + 0x0e, 0x2a, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x32, 0x05, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x52, + 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x3a, 0x4f, 0x92, 0x41, 0x4c, 0x0a, 0x4a, 0x2a, 0x14, 0x50, + 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, + 0x6f, 0x6c, 0x65, 0x32, 0x32, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x2c, 0x20, 0x72, 0x6f, + 0x6c, 0x65, 0x20, 0x61, 0x6e, 0x64, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x20, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x70, 0x65, 0x72, + 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x22, 0xf5, 0x02, 0x0a, 0x0a, 0x50, 0x65, 0x72, 0x6d, + 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x2f, 0x0a, 0x07, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, + 0x74, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x15, 0x92, 0x41, 0x12, 0x2a, 0x07, 0x50, 0x72, + 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x32, 0x07, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x52, 0x07, + 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x12, 0x37, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x19, 0x92, 0x41, 0x16, 0x2a, + 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x32, 0x09, 0x4e, 0x61, 0x6d, 0x65, + 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x12, 0x23, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, + 0x92, 0x41, 0x0c, 0x2a, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x32, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x52, + 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x50, 0x0a, 0x0b, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x09, 0x42, 0x2e, 0x92, 0x41, 0x2b, 0x2a, + 0x0b, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x32, 0x1c, 0x50, 0x65, + 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x20, 0x70, 0x72, 0x6f, 0x76, 0x69, 0x64, + 0x65, 0x64, 0x20, 0x62, 0x79, 0x20, 0x72, 0x6f, 0x6c, 0x65, 0x52, 0x0b, 0x70, 0x65, 0x72, 0x6d, + 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x12, 0x65, 0x0a, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x42, 0x4f, 0x92, 0x41, 0x4c, 0x2a, 0x05, 0x53, 0x63, 0x6f, + 0x70, 0x65, 0x32, 0x43, 0x53, 0x63, 0x6f, 0x70, 0x65, 0x20, 0x68, 0x6f, 0x6c, 0x64, 0x73, 0x20, + 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x61, 0x62, 0x6f, 0x75, + 0x74, 0x20, 0x6f, 0x72, 0x67, 0x20, 0x77, 0x69, 0x64, 0x65, 0x2c, 0x20, 0x70, 0x72, 0x6f, 0x6a, + 0x65, 0x63, 0x74, 0x20, 0x6f, 0x72, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, + 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x52, 0x05, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x3a, 0x1f, + 0x92, 0x41, 0x1c, 0x0a, 0x1a, 0x2a, 0x0b, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, + 0x6e, 0x73, 0x32, 0x0b, 0x50, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x73, 0x22, + 0xda, 0x02, 0x0a, 0x09, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x53, 0x70, 0x65, 0x63, 0x12, 0xb2, 0x01, + 0x0a, 0x15, 0x70, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, + 0x63, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2f, 0x2e, + 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, + 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, + 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x42, 0x4b, + 0x92, 0x41, 0x48, 0x2a, 0x15, 0x50, 0x72, 0x6f, 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, + 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x6c, 0x65, 0x73, 0x32, 0x2f, 0x50, 0x72, 0x6f, 0x6a, + 0x65, 0x63, 0x74, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x2c, 0x20, + 0x72, 0x6f, 0x6c, 0x65, 0x20, 0x61, 0x73, 0x73, 0x6f, 0x63, 0x69, 0x61, 0x74, 0x69, 0x6f, 0x6e, + 0x73, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x15, 0x70, 0x72, 0x6f, + 0x6a, 0x65, 0x63, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x6f, 0x6c, + 0x65, 0x73, 0x12, 0x39, 0x0a, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, + 0x09, 0x42, 0x23, 0x92, 0x41, 0x20, 0x2a, 0x05, 0x55, 0x73, 0x65, 0x72, 0x73, 0x32, 0x17, 0x4c, + 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x75, 0x73, 0x65, 0x72, 0x73, 0x20, 0x66, 0x6f, 0x72, + 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x05, 0x75, 0x73, 0x65, 0x72, 0x73, 0x12, 0x2c, 0x0a, + 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x18, 0x92, 0x41, 0x15, + 0x2a, 0x04, 0x54, 0x79, 0x70, 0x65, 0x32, 0x0d, 0x54, 0x79, 0x70, 0x65, 0x20, 0x6f, 0x66, 0x20, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x3a, 0x2f, 0x92, 0x41, 0x2c, + 0x0a, 0x2a, 0x2a, 0x13, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, + 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0x13, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x73, + 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xa9, 0x03, 0x0a, + 0x09, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x5a, 0x0a, 0x0a, 0x61, 0x70, + 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x3a, + 0x92, 0x41, 0x37, 0x2a, 0x0b, 0x41, 0x50, 0x49, 0x20, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, + 0x32, 0x26, 0x41, 0x50, 0x49, 0x20, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x20, + 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x40, 0x01, 0x52, 0x0a, 0x61, 0x70, 0x69, 0x56, + 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x40, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x2c, 0x92, 0x41, 0x29, 0x2a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x32, + 0x1f, 0x4b, 0x69, 0x6e, 0x64, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, + 0x40, 0x01, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x7b, 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x70, 0x61, 0x72, + 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x34, 0x92, 0x41, 0x31, 0x2a, 0x08, 0x4d, 0x65, 0x74, 0x61, + 0x64, 0x61, 0x74, 0x61, 0x32, 0x23, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x20, 0x6f, + 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x6c, 0x69, 0x73, 0x74, + 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x40, 0x01, 0x52, 0x08, 0x6d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x61, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, - 0x42, 0x0a, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x37, - 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6c, - 0x75, 0x73, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x70, 0x62, 0x2f, 0x76, 0x33, - 0x3b, 0x75, 0x73, 0x65, 0x72, 0x76, 0x33, 0xa2, 0x02, 0x04, 0x50, 0x44, 0x54, 0x55, 0xaa, 0x02, - 0x19, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x44, 0x65, 0x76, 0x2e, 0x54, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x2e, 0x56, 0x33, 0xca, 0x02, 0x19, 0x50, 0x61, 0x72, - 0x61, 0x6c, 0x75, 0x73, 0x5c, 0x44, 0x65, 0x76, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x55, - 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, 0xe2, 0x02, 0x25, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, - 0x5c, 0x44, 0x65, 0x76, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x55, 0x73, 0x65, 0x72, 0x5c, - 0x56, 0x33, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, - 0x1d, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x3a, 0x3a, 0x44, 0x65, 0x76, 0x3a, 0x3a, 0x54, - 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x55, 0x73, 0x65, 0x72, 0x3a, 0x3a, 0x56, 0x33, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2e, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x42, 0x29, 0x92, 0x41, 0x26, 0x2a, 0x05, 0x49, 0x74, 0x65, + 0x6d, 0x73, 0x32, 0x1b, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, + 0x67, 0x72, 0x6f, 0x75, 0x70, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x40, + 0x01, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x3a, 0x1e, 0x92, 0x41, 0x1b, 0x0a, 0x19, 0x2a, + 0x09, 0x47, 0x72, 0x6f, 0x75, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x32, 0x0a, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x40, 0x01, 0x42, 0xed, 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, + 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, + 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x0a, 0x47, 0x72, 0x6f, 0x75, + 0x70, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2f, 0x70, 0x61, 0x72, + 0x61, 0x6c, 0x75, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, + 0x2f, 0x75, 0x73, 0x65, 0x72, 0x70, 0x62, 0x2f, 0x76, 0x33, 0x3b, 0x75, 0x73, 0x65, 0x72, 0x76, + 0x33, 0xa2, 0x02, 0x04, 0x50, 0x44, 0x54, 0x55, 0xaa, 0x02, 0x19, 0x50, 0x61, 0x72, 0x61, 0x6c, + 0x75, 0x73, 0x2e, 0x44, 0x65, 0x76, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x55, 0x73, 0x65, + 0x72, 0x2e, 0x56, 0x33, 0xca, 0x02, 0x19, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x5c, 0x44, + 0x65, 0x76, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, + 0xe2, 0x02, 0x25, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x5c, 0x44, 0x65, 0x76, 0x5c, 0x54, + 0x79, 0x70, 0x65, 0x73, 0x5c, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, 0x5c, 0x47, 0x50, 0x42, + 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1d, 0x50, 0x61, 0x72, 0x61, 0x6c, + 0x75, 0x73, 0x3a, 0x3a, 0x44, 0x65, 0x76, 0x3a, 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, + 0x55, 0x73, 0x65, 0x72, 0x3a, 0x3a, 0x56, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -651,8 +644,6 @@ func file_proto_types_userpb_v3_group_proto_init() { } } } - file_proto_types_userpb_v3_group_proto_msgTypes[1].OneofWrappers = []interface{}{} - file_proto_types_userpb_v3_group_proto_msgTypes[2].OneofWrappers = []interface{}{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/proto/types/userpb/v3/group.proto b/proto/types/userpb/v3/group.proto index 516a9a6..0ee4d5c 100644 --- a/proto/types/userpb/v3/group.proto +++ b/proto/types/userpb/v3/group.proto @@ -49,12 +49,12 @@ message ProjectNamespaceRole { description : "Project, role and namespace pairing for permission" } }; - optional string project = 1 + string project = 1 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { title : "Project" description : "Project" } ]; - optional string namespace = 2 + string namespace = 2 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { title : "Namespace" description : "Namespace" @@ -64,7 +64,7 @@ message ProjectNamespaceRole { title : "Role" description : "Role" } ]; - optional string group = 4 + string group = 4 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { title : "Group" description : "Group" @@ -78,12 +78,12 @@ message Permission { description : "Permissions" } }; - optional string project = 1 + string project = 1 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { title : "Project" description : "Project" } ]; - optional string namespace = 2 + string namespace = 2 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { title : "Namespace" description : "Namespace" @@ -98,7 +98,7 @@ message Permission { title : "Permissions" description : "Permissions provided by role" } ]; - optional string scope = 5 + string scope = 5 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { title : "Scope" description : "Scope holds information about org wide, project or namespace access" diff --git a/proto/types/userpb/v3/user.pb.go b/proto/types/userpb/v3/user.pb.go index fb5bf5f..33cfa79 100644 --- a/proto/types/userpb/v3/user.pb.go +++ b/proto/types/userpb/v3/user.pb.go @@ -1,6 +1,6 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.31.0 +// protoc-gen-go v1.34.1 // protoc (unknown) // source: proto/types/userpb/v3/user.proto @@ -305,7 +305,7 @@ type UserSpec struct { ProjectNamespaceRoles []*ProjectNamespaceRole `protobuf:"bytes,8,rep,name=projectNamespaceRoles,proto3" json:"projectNamespaceRoles,omitempty"` EmailVerified bool `protobuf:"varint,9,opt,name=emailVerified,proto3" json:"emailVerified,omitempty"` PhoneVerified bool `protobuf:"varint,10,opt,name=phoneVerified,proto3" json:"phoneVerified,omitempty"` - RecoveryUrl *string `protobuf:"bytes,11,opt,name=recoveryUrl,proto3,oneof" json:"recoveryUrl,omitempty"` + RecoveryUrl string `protobuf:"bytes,11,opt,name=recoveryUrl,proto3" json:"recoveryUrl,omitempty"` LastLogin string `protobuf:"bytes,12,opt,name=lastLogin,proto3" json:"lastLogin,omitempty"` ForceReset bool `protobuf:"varint,13,opt,name=forceReset,proto3" json:"forceReset,omitempty"` } @@ -406,8 +406,8 @@ func (x *UserSpec) GetPhoneVerified() bool { } func (x *UserSpec) GetRecoveryUrl() string { - if x != nil && x.RecoveryUrl != nil { - return *x.RecoveryUrl + if x != nil { + return x.RecoveryUrl } return "" } @@ -699,7 +699,7 @@ var file_proto_types_userpb_v3_user_proto_rawDesc = []byte{ 0x37, 0x92, 0x41, 0x34, 0x0a, 0x32, 0x2a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x32, 0x04, 0x55, 0x73, 0x65, 0x72, 0xd2, 0x01, 0x0a, 0x61, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0xd2, 0x01, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0xd2, 0x01, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, - 0x61, 0xd2, 0x01, 0x04, 0x73, 0x70, 0x65, 0x63, 0x22, 0xc8, 0x09, 0x0a, 0x08, 0x55, 0x73, 0x65, + 0x61, 0xd2, 0x01, 0x04, 0x73, 0x70, 0x65, 0x63, 0x22, 0xb3, 0x09, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x53, 0x70, 0x65, 0x63, 0x12, 0x44, 0x0a, 0x09, 0x66, 0x69, 0x72, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, 0x26, 0x92, 0x41, 0x23, 0x2a, 0x09, 0x46, 0x69, 0x72, 0x73, 0x74, 0x4e, 0x61, 0x6d, 0x65, 0x32, 0x16, 0x46, 0x69, 0x72, 0x73, 0x74, 0x20, @@ -751,88 +751,87 @@ var file_proto_types_userpb_v3_user_proto_rawDesc = []byte{ 0x6e, 0x65, 0x20, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x77, 0x61, 0x73, 0x20, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x65, 0x64, 0x40, 0x01, 0x52, 0x0d, 0x70, 0x68, 0x6f, 0x6e, 0x65, 0x56, 0x65, 0x72, 0x69, 0x66, - 0x69, 0x65, 0x64, 0x12, 0x6b, 0x0a, 0x0b, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x55, + 0x69, 0x65, 0x64, 0x12, 0x66, 0x0a, 0x0b, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x55, 0x72, 0x6c, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x42, 0x44, 0x92, 0x41, 0x41, 0x2a, 0x0c, 0x52, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x20, 0x55, 0x72, 0x6c, 0x32, 0x2f, 0x49, 0x6e, 0x69, 0x74, 0x69, 0x61, 0x6c, 0x20, 0x73, 0x69, 0x67, 0x6e, 0x75, 0x70, 0x20, 0x55, 0x52, 0x4c, 0x20, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x65, 0x64, 0x20, 0x61, 0x66, 0x74, 0x65, 0x72, 0x20, 0x75, - 0x73, 0x65, 0x72, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x40, 0x01, 0x48, 0x00, - 0x52, 0x0b, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x55, 0x72, 0x6c, 0x88, 0x01, 0x01, - 0x12, 0x58, 0x0a, 0x09, 0x6c, 0x61, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x18, 0x0c, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x3a, 0x92, 0x41, 0x37, 0x2a, 0x09, 0x4c, 0x61, 0x73, 0x74, 0x4c, 0x6f, - 0x67, 0x69, 0x6e, 0x32, 0x28, 0x4c, 0x61, 0x73, 0x74, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, - 0x20, 0x64, 0x61, 0x74, 0x65, 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20, 0x69, 0x6e, 0x20, 0x52, 0x46, - 0x43, 0x33, 0x33, 0x33, 0x39, 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x40, 0x01, 0x52, - 0x09, 0x6c, 0x61, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x66, - 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x42, - 0x67, 0x92, 0x41, 0x64, 0x2a, 0x0a, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, - 0x32, 0x56, 0x54, 0x68, 0x69, 0x73, 0x20, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x20, - 0x75, 0x73, 0x65, 0x72, 0x20, 0x68, 0x61, 0x73, 0x20, 0x61, 0x75, 0x74, 0x6f, 0x20, 0x67, 0x65, - 0x6e, 0x65, 0x72, 0x61, 0x74, 0x65, 0x64, 0x20, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, - 0x2e, 0x20, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x20, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x20, - 0x72, 0x65, 0x73, 0x65, 0x74, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x70, - 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2e, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x52, - 0x65, 0x73, 0x65, 0x74, 0x3a, 0x2d, 0x92, 0x41, 0x2a, 0x0a, 0x28, 0x2a, 0x12, 0x55, 0x73, 0x65, - 0x72, 0x20, 0x53, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x32, - 0x12, 0x55, 0x73, 0x65, 0x72, 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, - 0x69, 0x6f, 0x6e, 0x42, 0x0e, 0x0a, 0x0c, 0x5f, 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, - 0x55, 0x72, 0x6c, 0x22, 0xc3, 0x03, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, - 0x12, 0x71, 0x0a, 0x0a, 0x61, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x51, 0x92, 0x41, 0x4e, 0x2a, 0x0b, 0x41, 0x50, 0x49, 0x20, 0x56, - 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x32, 0x25, 0x41, 0x50, 0x49, 0x20, 0x56, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, - 0x6c, 0x69, 0x73, 0x74, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x16, 0x75, - 0x73, 0x65, 0x72, 0x6d, 0x67, 0x6d, 0x74, 0x2e, 0x6b, 0x38, 0x73, 0x6d, 0x67, 0x6d, 0x74, 0x2e, - 0x69, 0x6f, 0x2f, 0x76, 0x33, 0x40, 0x01, 0x52, 0x0a, 0x61, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, - 0x69, 0x6f, 0x6e, 0x12, 0x49, 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x42, 0x35, 0x92, 0x41, 0x32, 0x2a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x32, 0x1e, 0x4b, 0x69, - 0x6e, 0x64, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x6c, - 0x69, 0x73, 0x74, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x08, 0x55, 0x73, - 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x40, 0x01, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x7a, - 0x0a, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, - 0x32, 0x29, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, - 0x79, 0x70, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, - 0x69, 0x73, 0x74, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x33, 0x92, 0x41, 0x30, - 0x2a, 0x08, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x32, 0x22, 0x4d, 0x65, 0x74, 0x61, - 0x64, 0x61, 0x74, 0x61, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, - 0x20, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x40, 0x01, - 0x52, 0x08, 0x6d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x5f, 0x0a, 0x05, 0x69, 0x74, - 0x65, 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, + 0x73, 0x65, 0x72, 0x20, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x40, 0x01, 0x52, 0x0b, + 0x72, 0x65, 0x63, 0x6f, 0x76, 0x65, 0x72, 0x79, 0x55, 0x72, 0x6c, 0x12, 0x58, 0x0a, 0x09, 0x6c, + 0x61, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x09, 0x42, 0x3a, + 0x92, 0x41, 0x37, 0x2a, 0x09, 0x4c, 0x61, 0x73, 0x74, 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x32, 0x28, + 0x4c, 0x61, 0x73, 0x74, 0x20, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x20, 0x64, 0x61, 0x74, 0x65, + 0x20, 0x74, 0x69, 0x6d, 0x65, 0x20, 0x69, 0x6e, 0x20, 0x52, 0x46, 0x43, 0x33, 0x33, 0x33, 0x39, + 0x20, 0x66, 0x6f, 0x72, 0x6d, 0x61, 0x74, 0x2e, 0x40, 0x01, 0x52, 0x09, 0x6c, 0x61, 0x73, 0x74, + 0x4c, 0x6f, 0x67, 0x69, 0x6e, 0x12, 0x87, 0x01, 0x0a, 0x0a, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x52, + 0x65, 0x73, 0x65, 0x74, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x08, 0x42, 0x67, 0x92, 0x41, 0x64, 0x2a, + 0x0a, 0x46, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x32, 0x56, 0x54, 0x68, 0x69, + 0x73, 0x20, 0x69, 0x6e, 0x64, 0x69, 0x63, 0x61, 0x74, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, + 0x68, 0x61, 0x73, 0x20, 0x61, 0x75, 0x74, 0x6f, 0x20, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x74, + 0x65, 0x64, 0x20, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, 0x72, 0x64, 0x2e, 0x20, 0x43, 0x6c, 0x69, + 0x65, 0x6e, 0x74, 0x20, 0x73, 0x68, 0x6f, 0x75, 0x6c, 0x64, 0x20, 0x72, 0x65, 0x73, 0x65, 0x74, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x70, 0x61, 0x73, 0x73, 0x77, 0x6f, + 0x72, 0x64, 0x2e, 0x52, 0x0a, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x52, 0x65, 0x73, 0x65, 0x74, 0x3a, + 0x2d, 0x92, 0x41, 0x2a, 0x0a, 0x28, 0x2a, 0x12, 0x55, 0x73, 0x65, 0x72, 0x20, 0x53, 0x70, 0x65, + 0x63, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x32, 0x12, 0x55, 0x73, 0x65, 0x72, + 0x20, 0x73, 0x70, 0x65, 0x63, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x22, 0xc3, + 0x03, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x71, 0x0a, 0x0a, 0x61, + 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x51, 0x92, 0x41, 0x4e, 0x2a, 0x0b, 0x41, 0x50, 0x49, 0x20, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, + 0x6e, 0x32, 0x25, 0x41, 0x50, 0x49, 0x20, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x20, 0x6f, + 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x20, + 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x16, 0x75, 0x73, 0x65, 0x72, 0x6d, 0x67, + 0x6d, 0x74, 0x2e, 0x6b, 0x38, 0x73, 0x6d, 0x67, 0x6d, 0x74, 0x2e, 0x69, 0x6f, 0x2f, 0x76, 0x33, + 0x40, 0x01, 0x52, 0x0a, 0x61, 0x70, 0x69, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x49, + 0x0a, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x35, 0x92, 0x41, + 0x32, 0x2a, 0x04, 0x4b, 0x69, 0x6e, 0x64, 0x32, 0x1e, 0x4b, 0x69, 0x6e, 0x64, 0x20, 0x6f, 0x66, + 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x20, 0x72, + 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x3a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, + 0x74, 0x40, 0x01, 0x52, 0x04, 0x6b, 0x69, 0x6e, 0x64, 0x12, 0x7a, 0x0a, 0x08, 0x6d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x29, 0x2e, 0x70, 0x61, + 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, + 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x33, 0x2e, 0x4c, 0x69, 0x73, 0x74, 0x4d, 0x65, + 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x42, 0x33, 0x92, 0x41, 0x30, 0x2a, 0x08, 0x4d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x32, 0x22, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0x20, + 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x6c, 0x69, 0x73, 0x74, + 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x40, 0x01, 0x52, 0x08, 0x6d, 0x65, 0x74, + 0x61, 0x64, 0x61, 0x74, 0x61, 0x12, 0x5f, 0x0a, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x18, 0x04, + 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, + 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, + 0x2e, 0x55, 0x73, 0x65, 0x72, 0x42, 0x28, 0x92, 0x41, 0x25, 0x2a, 0x05, 0x49, 0x74, 0x65, 0x6d, + 0x73, 0x32, 0x1a, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, 0x74, 0x68, 0x65, 0x20, 0x75, + 0x73, 0x65, 0x72, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x73, 0x40, 0x01, 0x52, + 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x3a, 0x1c, 0x92, 0x41, 0x19, 0x0a, 0x17, 0x2a, 0x08, 0x55, + 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x32, 0x09, 0x55, 0x73, 0x65, 0x72, 0x20, 0x6c, 0x69, + 0x73, 0x74, 0x40, 0x01, 0x22, 0xcc, 0x01, 0x0a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x52, 0x6f, 0x6c, + 0x65, 0x12, 0x23, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x42, + 0x0f, 0x92, 0x41, 0x0c, 0x2a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x32, 0x04, 0x55, 0x73, 0x65, 0x72, + 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, 0x92, 0x41, 0x0c, 0x2a, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x32, + 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, 0x12, 0x37, 0x0a, 0x09, 0x6e, + 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x42, 0x19, + 0x92, 0x41, 0x16, 0x2a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x32, 0x09, + 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, + 0x70, 0x61, 0x63, 0x65, 0x3a, 0x3d, 0x92, 0x41, 0x3a, 0x0a, 0x38, 0x2a, 0x08, 0x55, 0x73, 0x65, + 0x72, 0x52, 0x6f, 0x6c, 0x65, 0x32, 0x2c, 0x55, 0x73, 0x65, 0x72, 0x2c, 0x20, 0x72, 0x6f, 0x6c, + 0x65, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x20, 0x70, 0x61, 0x69, + 0x72, 0x69, 0x6e, 0x67, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x70, 0x65, 0x72, 0x6d, 0x69, 0x73, 0x73, + 0x69, 0x6f, 0x6e, 0x42, 0xec, 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x75, 0x73, - 0x65, 0x72, 0x2e, 0x76, 0x33, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x42, 0x28, 0x92, 0x41, 0x25, 0x2a, - 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x32, 0x1a, 0x4c, 0x69, 0x73, 0x74, 0x20, 0x6f, 0x66, 0x20, - 0x74, 0x68, 0x65, 0x20, 0x75, 0x73, 0x65, 0x72, 0x20, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, - 0x65, 0x73, 0x40, 0x01, 0x52, 0x05, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x3a, 0x1c, 0x92, 0x41, 0x19, - 0x0a, 0x17, 0x2a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x4c, 0x69, 0x73, 0x74, 0x32, 0x09, 0x55, 0x73, - 0x65, 0x72, 0x20, 0x6c, 0x69, 0x73, 0x74, 0x40, 0x01, 0x22, 0xcc, 0x01, 0x0a, 0x08, 0x55, 0x73, - 0x65, 0x72, 0x52, 0x6f, 0x6c, 0x65, 0x12, 0x23, 0x0a, 0x04, 0x75, 0x73, 0x65, 0x72, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, 0x92, 0x41, 0x0c, 0x2a, 0x04, 0x55, 0x73, 0x65, 0x72, 0x32, - 0x04, 0x55, 0x73, 0x65, 0x72, 0x52, 0x04, 0x75, 0x73, 0x65, 0x72, 0x12, 0x23, 0x0a, 0x04, 0x72, - 0x6f, 0x6c, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x42, 0x0f, 0x92, 0x41, 0x0c, 0x2a, 0x04, - 0x52, 0x6f, 0x6c, 0x65, 0x32, 0x04, 0x52, 0x6f, 0x6c, 0x65, 0x52, 0x04, 0x72, 0x6f, 0x6c, 0x65, - 0x12, 0x37, 0x0a, 0x09, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x18, 0x03, 0x20, - 0x01, 0x28, 0x09, 0x42, 0x19, 0x92, 0x41, 0x16, 0x2a, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, - 0x61, 0x63, 0x65, 0x32, 0x09, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x52, 0x09, - 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x3a, 0x3d, 0x92, 0x41, 0x3a, 0x0a, 0x38, - 0x2a, 0x08, 0x55, 0x73, 0x65, 0x72, 0x52, 0x6f, 0x6c, 0x65, 0x32, 0x2c, 0x55, 0x73, 0x65, 0x72, - 0x2c, 0x20, 0x72, 0x6f, 0x6c, 0x65, 0x2c, 0x20, 0x6e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, - 0x65, 0x20, 0x70, 0x61, 0x69, 0x72, 0x69, 0x6e, 0x67, 0x20, 0x66, 0x6f, 0x72, 0x20, 0x70, 0x65, - 0x72, 0x6d, 0x69, 0x73, 0x73, 0x69, 0x6f, 0x6e, 0x42, 0xec, 0x01, 0x0a, 0x1d, 0x63, 0x6f, 0x6d, - 0x2e, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x64, 0x65, 0x76, 0x2e, 0x74, 0x79, 0x70, - 0x65, 0x73, 0x2e, 0x75, 0x73, 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x55, 0x73, 0x65, 0x72, - 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x50, 0x01, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2f, 0x70, 0x61, 0x72, 0x61, - 0x6c, 0x75, 0x73, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, - 0x75, 0x73, 0x65, 0x72, 0x70, 0x62, 0x2f, 0x76, 0x33, 0x3b, 0x75, 0x73, 0x65, 0x72, 0x76, 0x33, - 0xa2, 0x02, 0x04, 0x50, 0x44, 0x54, 0x55, 0xaa, 0x02, 0x19, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, - 0x73, 0x2e, 0x44, 0x65, 0x76, 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x55, 0x73, 0x65, 0x72, - 0x2e, 0x56, 0x33, 0xca, 0x02, 0x19, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x5c, 0x44, 0x65, - 0x76, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, 0xe2, - 0x02, 0x25, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x5c, 0x44, 0x65, 0x76, 0x5c, 0x54, 0x79, - 0x70, 0x65, 0x73, 0x5c, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, 0x5c, 0x47, 0x50, 0x42, 0x4d, - 0x65, 0x74, 0x61, 0x64, 0x61, 0x74, 0x61, 0xea, 0x02, 0x1d, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, - 0x73, 0x3a, 0x3a, 0x44, 0x65, 0x76, 0x3a, 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x55, - 0x73, 0x65, 0x72, 0x3a, 0x3a, 0x56, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x2e, 0x76, 0x33, 0x42, 0x09, 0x55, 0x73, 0x65, 0x72, 0x50, 0x72, 0x6f, 0x74, 0x6f, + 0x50, 0x01, 0x5a, 0x37, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x70, + 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2f, 0x70, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2f, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x74, 0x79, 0x70, 0x65, 0x73, 0x2f, 0x75, 0x73, 0x65, 0x72, 0x70, + 0x62, 0x2f, 0x76, 0x33, 0x3b, 0x75, 0x73, 0x65, 0x72, 0x76, 0x33, 0xa2, 0x02, 0x04, 0x50, 0x44, + 0x54, 0x55, 0xaa, 0x02, 0x19, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x2e, 0x44, 0x65, 0x76, + 0x2e, 0x54, 0x79, 0x70, 0x65, 0x73, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x2e, 0x56, 0x33, 0xca, 0x02, + 0x19, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x5c, 0x44, 0x65, 0x76, 0x5c, 0x54, 0x79, 0x70, + 0x65, 0x73, 0x5c, 0x55, 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, 0xe2, 0x02, 0x25, 0x50, 0x61, 0x72, + 0x61, 0x6c, 0x75, 0x73, 0x5c, 0x44, 0x65, 0x76, 0x5c, 0x54, 0x79, 0x70, 0x65, 0x73, 0x5c, 0x55, + 0x73, 0x65, 0x72, 0x5c, 0x56, 0x33, 0x5c, 0x47, 0x50, 0x42, 0x4d, 0x65, 0x74, 0x61, 0x64, 0x61, + 0x74, 0x61, 0xea, 0x02, 0x1d, 0x50, 0x61, 0x72, 0x61, 0x6c, 0x75, 0x73, 0x3a, 0x3a, 0x44, 0x65, + 0x76, 0x3a, 0x3a, 0x54, 0x79, 0x70, 0x65, 0x73, 0x3a, 0x3a, 0x55, 0x73, 0x65, 0x72, 0x3a, 0x3a, + 0x56, 0x33, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -959,7 +958,6 @@ func file_proto_types_userpb_v3_user_proto_init() { } } } - file_proto_types_userpb_v3_user_proto_msgTypes[3].OneofWrappers = []interface{}{} type x struct{} out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ diff --git a/proto/types/userpb/v3/user.proto b/proto/types/userpb/v3/user.proto index 6bcca4d..6296c21 100644 --- a/proto/types/userpb/v3/user.proto +++ b/proto/types/userpb/v3/user.proto @@ -199,7 +199,7 @@ message UserSpec { description : "Flag to show if phone number of the user was verified" read_only : true } ]; - optional string recoveryUrl = 11 + string recoveryUrl = 11 [ (grpc.gateway.protoc_gen_openapiv2.options.openapiv2_field) = { title : "Recovery Url", description : "Initial signup URL returned after user creation" diff --git a/scripts/initialize/main.go b/scripts/initialize/main.go index 1d725e0..a7dedd7 100644 --- a/scripts/initialize/main.go +++ b/scripts/initialize/main.go @@ -309,7 +309,7 @@ retry: Password: p, Groups: []string{admingrp.Metadata.Name, localUsersGrp.Metadata.Name}, ProjectNamespaceRoles: []*userv3.ProjectNamespaceRole{ - {Role: "ADMIN", Group: &admingrp.Metadata.Name}, + {Role: "ADMIN", Group: admingrp.Metadata.Name}, }, ForceReset: true, }, diff --git a/scripts/initialize/permissions/base/cli_config_read.json b/scripts/initialize/permissions/base/cli_config_read.json new file mode 100644 index 0000000..6608a00 --- /dev/null +++ b/scripts/initialize/permissions/base/cli_config_read.json @@ -0,0 +1,15 @@ +{ + "name": "cli.config.read", + "resource_urls": [ + { + "url": "/cli/config", + "methods": [ + "GET" + ] + } + ], + "base_url": "/auth/v3", + "description": "Download cli configuration", + "authenticated": true, + "scope": "PROJECT" + } \ No newline at end of file diff --git a/scripts/initialize/roles/ztka/roles.json b/scripts/initialize/roles/ztka/roles.json index 4cbbb10..d069ae7 100644 --- a/scripts/initialize/roles/ztka/roles.json +++ b/scripts/initialize/roles/ztka/roles.json @@ -76,7 +76,8 @@ "cluster.write", "hub.openapi.explorer.read", "project.read", - "project.write" + "project.write", + "cli.config.read" ], "PROJECT_READ_ONLY": [ "console.all", @@ -89,7 +90,8 @@ "v2debug.read", "kubectl.cluster.read", "cluster.read", - "hub.openapi.explorer.read" + "hub.openapi.explorer.read", + "cli.config.read" ], "CLUSTER_ADMIN": [ "console.all", @@ -104,7 +106,8 @@ "kubectl.clustersettings.write", "kubectl.cluster.read", "cluster.read", - "kubectl.fullaccess" + "kubectl.fullaccess", + "cli.config.read" ] }, "NAMESPACE": { @@ -117,7 +120,8 @@ "kubeconfig.read", "v2debug.read", "kubectl.namespace.read", - "kubectl.namespace.write" + "kubectl.namespace.write", + "cli.config.read" ], "NAMESPACE_READ_ONLY": [ "partner.read", @@ -126,7 +130,8 @@ "cluster.read", "kubeconfig.read", "v2debug.read", - "kubectl.namespace.read" + "kubectl.namespace.read", + "cli.config.read" ] } } diff --git a/server/user.go b/server/user.go index 727f469..ecf6658 100644 --- a/server/user.go +++ b/server/user.go @@ -88,8 +88,10 @@ func (s *userServer) DownloadCliConfig(ctx context.Context, req *rpcv3.CliConfig return nil, fmt.Errorf("unable to retrieve session data") } request := &rpcv3.ApiKeyRequest{ - Username: sessData.Username, - Id: sessData.Account, + Username: sessData.Username, + Id: sessData.Account, + OrganizationId: sessData.Organization, + PartnerId: sessData.Partner, } cliConfig, err := s.us.RetrieveCliConfig(ctx, request) if err != nil { diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..1538d98 --- /dev/null +++ b/shell.nix @@ -0,0 +1,31 @@ +{ pkgs ? import (fetchTarball "https://github.com/NixOS/nixpkgs/archive/refs/tags/24.05-beta.tar.gz") { } }: +pkgs.mkShell { + hardeningDisable = [ "fortify" ]; # needed for dlv to work (https://github.com/NixOS/nixpkgs/issues/18995) + buildInputs = with pkgs; [ + # go + go_1_22 + buf + golangci-lint + go-migrate + protobuf + + # test + moq + + #db schema + atlas + + # protoc plugins + protoc-gen-go + protoc-gen-go-grpc + grpc-gateway # adds protoc-gen-grpc-gateway and protoc-gen-openapiv2 + + # debugging + delve + + # other + gnumake + ]; + + GOPRIVATE = "github.com/RafaySystems/*"; +}