From 4955456ad0e38a08fbbbe95ad943c4467bd4f5e0 Mon Sep 17 00:00:00 2001 From: Jozef Kralik Date: Fri, 19 Jul 2024 15:17:47 +0000 Subject: [PATCH] fix for CR 2 --- grpc-gateway/pb/hubConfiguration.pb.go | 2 +- m2m-oauth-server/pb/README.md | 2 +- m2m-oauth-server/pb/doc.html | 2 +- m2m-oauth-server/pb/service.pb.go | 2 +- m2m-oauth-server/pb/service.proto | 2 +- m2m-oauth-server/pb/service.swagger.json | 2 +- m2m-oauth-server/swagger.yaml | 2 +- snippet-service/pb/service.pb.go | 12 ++++++------ 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/grpc-gateway/pb/hubConfiguration.pb.go b/grpc-gateway/pb/hubConfiguration.pb.go index 497f005cc..716c681e5 100644 --- a/grpc-gateway/pb/hubConfiguration.pb.go +++ b/grpc-gateway/pb/hubConfiguration.pb.go @@ -66,7 +66,7 @@ type OAuthClient struct { ClientId string `protobuf:"bytes,1,opt,name=client_id,json=clientId,proto3" json:"client_id,omitempty" yaml:"clientID"` // @gotags: yaml:"clientID" Audience string `protobuf:"bytes,2,opt,name=audience,proto3" json:"audience,omitempty"` Scopes []string `protobuf:"bytes,3,rep,name=scopes,proto3" json:"scopes,omitempty"` - ProviderName string `protobuf:"bytes,4,opt,name=provider_name,json=providerName,proto3" json:"provider_name,omitempty" yaml:"providerName"` // @gotags: yaml:"providerName" + ProviderName string `protobuf:"bytes,4,opt,name=provider_name,json=providerName,proto3" json:"provider_name,omitempty" yaml:"providerName"` // @gotags: yaml:"providerName" ClientAssertionType string `protobuf:"bytes,5,opt,name=client_assertion_type,json=clientAssertionType,proto3" json:"client_assertion_type,omitempty" yaml:"clientAssertionType"` // @gotags: yaml:"clientAssertionType" Authority string `protobuf:"bytes,6,opt,name=authority,proto3" json:"authority,omitempty"` GrantType string `protobuf:"bytes,7,opt,name=grant_type,json=grantType,proto3" json:"grant_type,omitempty" yaml:"grantType"` // @gotags: yaml:"grantType" diff --git a/m2m-oauth-server/pb/README.md b/m2m-oauth-server/pb/README.md index bc8e8b657..25d133ddb 100644 --- a/m2m-oauth-server/pb/README.md +++ b/m2m-oauth-server/pb/README.md @@ -67,7 +67,7 @@ | client_secret | [string](#string) | | Client Secret | | audience | [string](#string) | repeated | Requested token Audience | | scope | [string](#string) | repeated | Requested token scopes | -| expiration | [int64](#int64) | | Requested token expiration in Unix timestamp seconds | +| expiration | [int64](#int64) | | The requested expiration time in unit timestamp seconds from the client. If not provided, the token will use the maximum allowed by the client, or if it exceeds the maximum allowed, an error will occur. | | client_assertion_type | [string](#string) | | Client assertion type | | client_assertion | [string](#string) | | Client assertion | | token_name | [string](#string) | | Token name | diff --git a/m2m-oauth-server/pb/doc.html b/m2m-oauth-server/pb/doc.html index 254f85a36..43ae551ac 100644 --- a/m2m-oauth-server/pb/doc.html +++ b/m2m-oauth-server/pb/doc.html @@ -318,7 +318,7 @@

CreateTokenRequest

expiration int64 -

Requested token expiration in Unix timestamp seconds

+

The requested expiration time in unit timestamp seconds from the client. If not provided, the token will use the maximum allowed by the client, or if it exceeds the maximum allowed, an error will occur.

diff --git a/m2m-oauth-server/pb/service.pb.go b/m2m-oauth-server/pb/service.pb.go index 8b756dd44..e93bab04f 100644 --- a/m2m-oauth-server/pb/service.pb.go +++ b/m2m-oauth-server/pb/service.pb.go @@ -341,7 +341,7 @@ type CreateTokenRequest struct { Audience []string `protobuf:"bytes,3,rep,name=audience,proto3" json:"audience,omitempty"` // Requested token scopes Scope []string `protobuf:"bytes,4,rep,name=scope,proto3" json:"scope,omitempty"` - // Requested token expiration in Unix timestamp seconds + // The requested expiration time in unit timestamp seconds from the client. If not provided, the token will use the maximum allowed by the client, or if it exceeds the maximum allowed, an error will occur. Expiration int64 `protobuf:"varint,5,opt,name=expiration,proto3" json:"expiration,omitempty"` // Client assertion type ClientAssertionType string `protobuf:"bytes,6,opt,name=client_assertion_type,json=clientAssertionType,proto3" json:"client_assertion_type,omitempty"` diff --git a/m2m-oauth-server/pb/service.proto b/m2m-oauth-server/pb/service.proto index fb74b3e78..3e79988b8 100644 --- a/m2m-oauth-server/pb/service.proto +++ b/m2m-oauth-server/pb/service.proto @@ -87,7 +87,7 @@ message CreateTokenRequest { repeated string audience = 3; // Requested token scopes repeated string scope = 4; - // Requested token expiration in Unix timestamp seconds + // The requested expiration time in unit timestamp seconds from the client. If not provided, the token will use the maximum allowed by the client, or if it exceeds the maximum allowed, an error will occur. int64 expiration = 5; // Client assertion type string client_assertion_type = 6; diff --git a/m2m-oauth-server/pb/service.swagger.json b/m2m-oauth-server/pb/service.swagger.json index 8738eba57..8a6492a2d 100644 --- a/m2m-oauth-server/pb/service.swagger.json +++ b/m2m-oauth-server/pb/service.swagger.json @@ -219,7 +219,7 @@ "expiration": { "type": "string", "format": "int64", - "title": "Requested token expiration in Unix timestamp seconds" + "description": "The requested expiration time in unit timestamp seconds from the client. If not provided, the token will use the maximum allowed by the client, or if it exceeds the maximum allowed, an error will occur." }, "clientAssertionType": { "type": "string", diff --git a/m2m-oauth-server/swagger.yaml b/m2m-oauth-server/swagger.yaml index b1fbadab5..1b8187ef8 100644 --- a/m2m-oauth-server/swagger.yaml +++ b/m2m-oauth-server/swagger.yaml @@ -266,7 +266,7 @@ components: items: type: string expiration: - title: Requested token expiration in Unix timestamp seconds + title: The requested expiration time in unit timestamp seconds from the client. If not provided, the token will use the maximum allowed by the client, or if it exceeds the maximum allowed, an error will occur. type: string format: int64 clientAssertionType: diff --git a/snippet-service/pb/service.pb.go b/snippet-service/pb/service.pb.go index 7f23b6748..ab33dcf66 100644 --- a/snippet-service/pb/service.pb.go +++ b/snippet-service/pb/service.pb.go @@ -765,8 +765,8 @@ type AppliedConfiguration struct { unknownFields protoimpl.UnknownFields Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` - DeviceId string `protobuf:"bytes,2,opt,name=device_id,json=deviceId,proto3" json:"device_id,omitempty" bson:"deviceId"` - ConfigurationId *AppliedConfiguration_LinkedTo `protobuf:"bytes,3,opt,name=configuration_id,json=configurationId,proto3" json:"configuration_id,omitempty" bson:"configurationId"` + DeviceId string `protobuf:"bytes,2,opt,name=device_id,json=deviceId,proto3" json:"device_id,omitempty" bson:"deviceId"` + ConfigurationId *AppliedConfiguration_LinkedTo `protobuf:"bytes,3,opt,name=configuration_id,json=configurationId,proto3" json:"configuration_id,omitempty" bson:"configurationId"` // Types that are assignable to ExecutedBy: // // *AppliedConfiguration_OnDemand @@ -882,7 +882,7 @@ type AppliedConfiguration_OnDemand struct { } type AppliedConfiguration_ConditionId struct { - ConditionId *AppliedConfiguration_LinkedTo `protobuf:"bytes,5,opt,name=condition_id,json=conditionId,proto3,oneof" bson:"conditionId"` + ConditionId *AppliedConfiguration_LinkedTo `protobuf:"bytes,5,opt,name=condition_id,json=conditionId,proto3,oneof" bson:"conditionId"` } func (*AppliedConfiguration_OnDemand) isAppliedConfiguration_ExecutedBy() {} @@ -1269,11 +1269,11 @@ type AppliedConfiguration_Resource struct { Href string `protobuf:"bytes,1,opt,name=href,proto3" json:"href,omitempty"` // Reused from invoke command or generated. Can be used to retrieve corresponding pending command. - CorrelationId string `protobuf:"bytes,2,opt,name=correlation_id,json=correlationId,proto3" json:"correlation_id,omitempty" bson:"correlationId"` + CorrelationId string `protobuf:"bytes,2,opt,name=correlation_id,json=correlationId,proto3" json:"correlation_id,omitempty" bson:"correlationId"` Status AppliedConfiguration_Resource_Status `protobuf:"varint,3,opt,name=status,proto3,enum=snippetservice.pb.AppliedConfiguration_Resource_Status" json:"status,omitempty"` - ResourceUpdated *events.ResourceUpdated `protobuf:"bytes,4,opt,name=resource_updated,json=resourceUpdated,proto3" json:"resource_updated,omitempty" bson:"resourceUpdated,omitempty"` + ResourceUpdated *events.ResourceUpdated `protobuf:"bytes,4,opt,name=resource_updated,json=resourceUpdated,proto3" json:"resource_updated,omitempty" bson:"resourceUpdated,omitempty"` // Unix nanoseconds timestamp for resource in PENDING status, until which the pending update is valid - ValidUntil int64 `protobuf:"varint,5,opt,name=valid_until,json=validUntil,proto3" json:"valid_until,omitempty" bson:"validUntil,omitempty"` + ValidUntil int64 `protobuf:"varint,5,opt,name=valid_until,json=validUntil,proto3" json:"valid_until,omitempty" bson:"validUntil,omitempty"` } func (x *AppliedConfiguration_Resource) Reset() {