Skip to content

Commit

Permalink
move JWTIssuer->TokenIssuer
Browse files Browse the repository at this point in the history
  • Loading branch information
tharindu1st committed Sep 6, 2023
1 parent edb63b9 commit a90a3c5
Show file tree
Hide file tree
Showing 14 changed files with 188 additions and 200 deletions.
2 changes: 1 addition & 1 deletion adapter/internal/operator/PROJECT
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ resources:
controller: true
domain: wso2.com
group: dp
kind: JWTIssuer
kind: TokenIssuer
path: github.com/wso2/apk/adapter/internal/operator/apis/dp/v1alpha1
version: v1alpha1
- api:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,21 @@ import (
// EDIT THIS FILE! THIS IS SCAFFOLDING FOR YOU TO OWN!
// NOTE: json tags are required. Any new fields you add must have json tags for the fields to be serialized.

// JWTIssuerSpec defines the desired state of JWTIssuer
type JWTIssuerSpec struct {
// Name is the unique name of the JWT Issuer in
// TokenIssuerSpec defines the desired state of TokenIssuer
type TokenIssuerSpec struct {
// Name is the unique name of the Token Issuer in
// the Organization defined . "Organization/Name" can
// be used to uniquely identify an Issuer.
//
// +kubebuilder:validation:MinLength=1
Name string `json:"name"`

// Organization denotes the organization of the JWT Issuer.
// Organization denotes the organization of the Token Issuer.
//
// +kubebuilder:validation:MinLength=1
Organization string `json:"organization"`

// Issuer denotes the issuer of the JWT Issuer.
// Issuer denotes the issuer of the Token Issuer.
//
// +kubebuilder:validation:MinLength=1
Issuer string `json:"issuer"`
Expand Down Expand Up @@ -98,8 +98,8 @@ type CERTConfig struct {
ConfigMapRef *RefConfig `json:"configMapRef,omitempty"`
}

// JWTIssuerStatus defines the observed state of JWTIssuer
type JWTIssuerStatus struct {
// TokenIssuerStatus defines the observed state of TokenIssuer
type TokenIssuerStatus struct {
// INSERT ADDITIONAL STATUS FIELD - define observed state of cluster
// Important: Run "make" to regenerate code after modifying this file
}
Expand All @@ -108,24 +108,24 @@ type JWTIssuerStatus struct {
//+kubebuilder:object:root=true
//+kubebuilder:subresource:status

// JWTIssuer is the Schema for the jwtissuers API
type JWTIssuer struct {
// TokenIssuer is the Schema for the tokenIssuer API
type TokenIssuer struct {
metav1.TypeMeta `json:",inline"`
metav1.ObjectMeta `json:"metadata,omitempty"`

Spec JWTIssuerSpec `json:"spec,omitempty"`
Status JWTIssuerStatus `json:"status,omitempty"`
Spec TokenIssuerSpec `json:"spec,omitempty"`
Status TokenIssuerStatus `json:"status,omitempty"`
}

//+kubebuilder:object:root=true

// JWTIssuerList contains a list of JWTIssuer
type JWTIssuerList struct {
// TokenIssuerList contains a list of TokenIssuer
type TokenIssuerList struct {
metav1.TypeMeta `json:",inline"`
metav1.ListMeta `json:"metadata,omitempty"`
Items []JWTIssuer `json:"items"`
Items []TokenIssuer `json:"items"`
}

func init() {
SchemeBuilder.Register(&JWTIssuer{}, &JWTIssuerList{})
SchemeBuilder.Register(&TokenIssuer{}, &TokenIssuerList{})
}
216 changes: 108 additions & 108 deletions adapter/internal/operator/apis/dp/v1alpha1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.9.2
creationTimestamp: null
name: jwtissuers.dp.wso2.com
name: tokenissuers.dp.wso2.com
spec:
group: dp.wso2.com
names:
kind: JWTIssuer
listKind: JWTIssuerList
plural: jwtissuers
singular: jwtissuer
kind: TokenIssuer
listKind: TokenIssuerList
plural: tokenissuers
singular: tokenissuer
scope: Namespaced
versions:
- name: v1alpha1
schema:
openAPIV3Schema:
description: JWTIssuer is the Schema for the jwtissuers API
description: TokenIssuer is the Schema for the tokenIssuer API
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation
Expand All @@ -33,7 +33,7 @@ spec:
metadata:
type: object
spec:
description: JWTIssuerSpec defines the desired state of JWTIssuer
description: TokenIssuerSpec defines the desired state of TokenIssuer
properties:
claimMappings:
description: ClaimMappings denotes the claim mappings of the jwt
Expand All @@ -57,17 +57,17 @@ spec:
minLength: 1
type: string
issuer:
description: Issuer denotes the issuer of the JWT Issuer.
description: Issuer denotes the issuer of the Token Issuer.
minLength: 1
type: string
name:
description: Name is the unique name of the JWT Issuer in the Organization
description: Name is the unique name of the Token Issuer in the Organization
defined . "Organization/Name" can be used to uniquely identify an
Issuer.
minLength: 1
type: string
organization:
description: Organization denotes the organization of the JWT Issuer.
description: Organization denotes the organization of the Token Issuer.
minLength: 1
type: string
scopesClaim:
Expand Down Expand Up @@ -211,7 +211,7 @@ spec:
- signatureValidation
type: object
status:
description: JWTIssuerStatus defines the observed state of JWTIssuer
description: TokenIssuerStatus defines the observed state of TokenIssuer
type: object
type: object
served: true
Expand Down

This file was deleted.

Loading

0 comments on commit a90a3c5

Please sign in to comment.