Updating apis to sync with the current operator APIs

.github/workflows/basic-tests.yaml

@@ -0,0 +1,44 @@
+#
+# Copyright contributors to the Hyperledger Fabric Operator project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# 	  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+name: basic-tests
+
+on:
+  push:
+    branches: [api]
+  pull_request:
+    branches: [api]
+
+env:
+  GO_VER: 1.18
+
+jobs:
+  make-checks:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Set up go
+        uses: actions/setup-go@v3
+        with:
+          go-version: ${{ env.GO_VER }}
+      - name: license header checks
+        run: make check-license
+      - name: gosec
+        run: make go-sec
+      - name: Run vet and format checks
+        run: make checks

Makefile

@@ -0,0 +1,35 @@
+#
+# Copyright contributors to the Hyperledger Fabric Operator project
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+# 	  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+## license checks
+check-license:
+	@scripts/check-licenses.sh
+
+# Run go fmt against code
+fmt:
+	go fmt ./...
+
+# Run go vet against code
+vet:
+	@scripts/checks.sh
+
+checks: fmt vet
+
+# gosec checks
+go-sec:
+	@scripts/go-sec.sh

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 {

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"