Updating apis to sync with the current operator APIs

Signed-off-by: asararatnakar <[email protected]>
hyperledger-labs · Dec 8, 2023 · 42476ea · 42476ea
1 parent b7a6be1
commit 42476ea
Show file tree

Hide file tree

Showing 18 changed files with 642 additions and 325 deletions.
diff --git a/api/orderer/v1/orderer.go b/api/orderer/v1/orderer.go
diff --git a/api/orderer/v2/orderer.go b/api/orderer/v2/orderer.go
diff --git a/api/v1beta1/common_struct.go b/api/v1beta1/common_struct.go
@@ -22,9 +22,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 )
 
-var BoolTrue = true
-var BoolFalse = false
-
 // Service is the overrides to be used for Service of the component
 // +operator-sdk:gen-csv:customresourcedefinitions.specDescriptors=true
 type Service struct {

diff --git a/api/v1beta1/ibpconsole_types.go b/api/v1beta1/ibpconsole_types.go
@@ -19,7 +19,7 @@
 package v1beta1
 
 import (
-	consolev1 "github.com/IBM-Blockchain/fabric-operator/api/console/v1"
+	consolev1 "github.com/IBM-Blockchain/fabric-operator/pkg/apis/console/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/api/ca/v1/ca.go → pkg/apis/ca/v1/ca.go b/api/ca/v1/ca.go → pkg/apis/ca/v1/ca.go
@@ -19,7 +19,7 @@
 package v1
 
 import (
-	"github.com/IBM-Blockchain/fabric-operator/api/common"
+	commonapi "github.com/IBM-Blockchain/fabric-operator/pkg/apis/common"
 )
 
 // ServerConfig is the fabric-ca server's config
@@ -88,6 +88,7 @@ type CAConfig struct {
 	CSP          *BCCSP                 `json:"bccsp,omitempty"`
 	Intermediate IntermediateCA         `json:"intermediate,omitempty"`
 	CRL          CRLConfig              `json:"crl,omitempty"`
+	Idemix       IdemixConfig           `json:"idemix,omitempty"`
 
 	// Optional client config for an intermediate server which acts as a client
 	// of the root (or parent) server
@@ -170,21 +171,21 @@ type Signing struct {
 // A SigningProfile stores information that the CA needs to store
 // signature policy.
 type SigningProfile struct {
-	Usage               []string        `json:"usage,omitempty"`
-	IssuerURL           []string        `json:"issuerurl,omitempty"`
-	OCSP                string          `json:"ocsp,omitempty"`
-	CRL                 string          `json:"crl,omitempty"`
-	CAConstraint        CAConstraint    `json:"caconstraint,omitempty"`
-	OCSPNoCheck         *bool           `json:"ocspnocheck,omitempty"`
-	ExpiryString        string          `json:"expirystring,omitempty"`
-	BackdateString      string          `json:"backdatestring,omitempty"`
-	AuthKeyName         string          `json:"authkeyname,omitempty"`
-	RemoteName          string          `json:"remotename,omitempty"`
-	NameWhitelistString string          `json:"namewhiteliststring,omitempty"`
-	AuthRemote          AuthRemote      `json:"authremote,omitempty"`
-	CTLogServers        []string        `json:"ctlogservers,omitempty"`
-	CertStore           string          `json:"certstore,omitempty"`
-	Expiry              common.Duration `json:"expiry,omitempty"`
+	Usage               []string           `json:"usage,omitempty"`
+	IssuerURL           []string           `json:"issuerurl,omitempty"`
+	OCSP                string             `json:"ocsp,omitempty"`
+	CRL                 string             `json:"crl,omitempty"`
+	CAConstraint        CAConstraint       `json:"caconstraint,omitempty"`
+	OCSPNoCheck         *bool              `json:"ocspnocheck,omitempty"`
+	ExpiryString        string             `json:"expirystring,omitempty"`
+	BackdateString      string             `json:"backdatestring,omitempty"`
+	AuthKeyName         string             `json:"authkeyname,omitempty"`
+	RemoteName          string             `json:"remotename,omitempty"`
+	NameWhitelistString string             `json:"namewhiteliststring,omitempty"`
+	AuthRemote          AuthRemote         `json:"authremote,omitempty"`
+	CTLogServers        []string           `json:"ctlogservers,omitempty"`
+	CertStore           string             `json:"certstore,omitempty"`
+	Expiry              commonapi.Duration `json:"expiry,omitempty"`
 
 	// TODO: Do these need to be overridable?
 	// AllowedExtensions   []cfconfig.OID  `json:"allowedextensions,omitempty"`
@@ -340,7 +341,19 @@ type CRLConfig struct {
 	// Specifies expiration for the CRL generated by the gencrl request
 	// The number of hours specified by this property is added to the UTC time, resulting time
 	// is used to set the 'Next Update' date of the CRL
-	Expiry common.Duration `json:"expiry,omitempty"`
+	Expiry commonapi.Duration `json:"expiry,omitempty"`
+}
+
+// IdemixConfig encapsulates Idemix related the configuration options
+type IdemixConfig struct {
+	Curve                    string `json:"curve,omitempty"`
+	IssuerPublicKeyfile      string `json:"issuerpublickeyfile,omitempty"`
+	IssuerSecretKeyfile      string `json:"issuersecretkeyfile,omitempty"`
+	RevocationPublicKeyfile  string `json:"revocationpublickeyfile,omitempty"`
+	RevocationPrivateKeyfile string `json:"revocationprivatekeyfile,omitempty"`
+	RHPoolSize               int    `json:"rhpoolsize,omitempty"`
+	NonceExpiration          string `json:"nonceexpiration,omitempty"`
+	NonceSweepInterval       string `json:"noncesweepinterval,omitempty"`
 }
 
 // Options contains configuration for the operations system
@@ -367,8 +380,8 @@ type TLS struct {
 
 // Statsd contains configuration of statsd
 type Statsd struct {
-	Network       string          `json:"network,omitempty"`
-	Address       string          `json:"address,omitempty"`
-	WriteInterval common.Duration `json:"writeinterval,omitempty"`
-	Prefix        string          `json:"prefix,omitempty"`
+	Network       string             `json:"network,omitempty"`
+	Address       string             `json:"address,omitempty"`
+	WriteInterval commonapi.Duration `json:"writeinterval,omitempty"`
+	Prefix        string             `json:"prefix,omitempty"`
 }
diff --git a/api/common/common.go → pkg/apis/common/common.go b/api/common/common.go → pkg/apis/common/common.go