diff --git a/.gitignore b/.gitignore index 8d4800e..ef9b88c 100644 --- a/.gitignore +++ b/.gitignore @@ -22,4 +22,7 @@ go.work # KCL & KPM cache file .kclvm -*.mod.lock \ No newline at end of file +*.mod.lock + +# Local binary files +bin/ diff --git a/example/dev/example_workspace.yaml b/example/dev/example_workspace.yaml index 8e1bffa..61a8fad 100644 --- a/example/dev/example_workspace.yaml +++ b/example/dev/example_workspace.yaml @@ -2,11 +2,11 @@ modules: kawesome: path: oci://ghcr.io/kusionstack/kawesome - version: 0.2.0 + version: 0.3.0 configs: default: service: labels: kusionstack.io/module-name: kawesome annotations: - kusionstack.io/module-version: 0.2.0 + kusionstack.io/module-version: 0.3.0 diff --git a/example/dev/kcl.mod b/example/dev/kcl.mod index 7cc6972..c630de0 100644 --- a/example/dev/kcl.mod +++ b/example/dev/kcl.mod @@ -2,7 +2,7 @@ name = "example" [dependencies] -kawesome = { oci = "oci://ghcr.io/kusionstack/kawesome", tag = "0.2.0" } +kawesome = { oci = "oci://ghcr.io/kusionstack/kawesome", tag = "0.3.0" } service = {oci = "oci://ghcr.io/kusionstack/service", tag = "0.1.0" } kam = { git = "https://github.com/KusionStack/kam.git", tag = "0.2.0" } diff --git a/kcl.mod b/kcl.mod index e54db7a..9528e93 100644 --- a/kcl.mod +++ b/kcl.mod @@ -1,3 +1,3 @@ [package] name = "kawesome" -version = "0.2.0" +version = "0.3.0" diff --git a/src/Makefile b/src/Makefile index 3068d4c..f0f2f95 100644 --- a/src/Makefile +++ b/src/Makefile @@ -2,7 +2,7 @@ TEST?=$$(go list ./... | grep -v 'vendor') ###### chang variables below according to your own modules ### NAMESPACE=kusionstack NAME=kawesome -VERSION=0.1.0 +VERSION=0.3.0 BINARY=../bin/kusion-module-${NAME}_${VERSION} LOCAL_ARCH := $(shell uname -m) diff --git a/src/go.mod b/src/go.mod index 00da063..2f816d5 100644 --- a/src/go.mod +++ b/src/go.mod @@ -1,49 +1,53 @@ module kawsome -go 1.22.1 +go 1.23.1 + +toolchain go1.23.2 require ( - github.com/stretchr/testify v1.9.0 + github.com/stretchr/testify v1.10.0 gopkg.in/yaml.v2 v2.4.0 - k8s.io/api v0.30.0 - k8s.io/apimachinery v0.30.0 - kusionstack.io/kusion v0.12.0-rc.3.0.20240612063438-7e50571609dc - kusionstack.io/kusion-module-framework v0.2.0 + k8s.io/api v0.31.3 + k8s.io/apimachinery v0.31.3 + kusionstack.io/kusion-api-go v0.13.0 + kusionstack.io/kusion-module-framework v0.2.3-beta.6 ) require ( - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/fatih/color v1.16.0 // indirect - github.com/go-logr/logr v1.4.1 // indirect + github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect + github.com/fatih/color v1.18.0 // indirect + github.com/fxamacker/cbor/v2 v2.7.0 // indirect + github.com/go-logr/logr v1.4.2 // indirect github.com/gogo/protobuf v1.3.2 // indirect github.com/golang/protobuf v1.5.4 // indirect github.com/google/gofuzz v1.2.0 // indirect - github.com/hashicorp/go-hclog v1.6.2 // indirect - github.com/hashicorp/go-plugin v1.6.0 // indirect - github.com/hashicorp/yamux v0.1.1 // indirect + github.com/hashicorp/go-hclog v1.6.3 // indirect + github.com/hashicorp/go-plugin v1.6.2 // indirect + github.com/hashicorp/yamux v0.1.2 // indirect github.com/json-iterator/go v1.1.12 // indirect github.com/mattn/go-colorable v0.1.13 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mitchellh/go-testing-interface v1.14.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect github.com/modern-go/reflect2 v1.0.2 // indirect github.com/oklog/run v1.1.0 // indirect github.com/pkg/errors v0.9.1 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/rogpeppe/go-internal v1.13.1 // indirect + github.com/x448/float16 v0.8.4 // indirect go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect - golang.org/x/net v0.23.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect - google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa // indirect - google.golang.org/grpc v1.64.0 // indirect - google.golang.org/protobuf v1.34.1 // indirect + golang.org/x/net v0.31.0 // indirect + golang.org/x/sys v0.27.0 // indirect + golang.org/x/text v0.20.0 // indirect + google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect + google.golang.org/grpc v1.68.0 // indirect + google.golang.org/protobuf v1.35.2 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/klog/v2 v2.120.1 // indirect - k8s.io/utils v0.0.0-20240310230437-4693a0247e57 // indirect - sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect - sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect + k8s.io/klog/v2 v2.130.1 // indirect + k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 // indirect + sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect sigs.k8s.io/yaml v1.4.0 // indirect ) diff --git a/src/go.sum b/src/go.sum index 09532a8..79e3fb8 100644 --- a/src/go.sum +++ b/src/go.sum @@ -3,13 +3,16 @@ github.com/bufbuild/protocompile v0.4.0/go.mod h1:3v93+mbWn/v3xzN+31nwkJfrEpAUwp github.com/bytedance/mockey v1.2.10 h1:4JlMpkm7HMXmTUtItid+iCu2tm61wvq+ca1X2u7ymzE= github.com/bytedance/mockey v1.2.10/go.mod h1:bNrUnI1u7+pAc0TYDgPATM+wF2yzHxmNH+iDXg4AOCU= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1VwoXQT9A3Wy9MM3WgvqSxFWenqJduM= +github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= -github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= -github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= -github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= +github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM= +github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU= +github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E= +github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ= +github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY= +github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= @@ -22,12 +25,12 @@ github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0= github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= -github.com/hashicorp/go-hclog v1.6.2 h1:NOtoftovWkDheyUM/8JW3QMiXyxJK3uHRK7wV04nD2I= -github.com/hashicorp/go-hclog v1.6.2/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= -github.com/hashicorp/go-plugin v1.6.0 h1:wgd4KxHJTVGGqWBq4QPB1i5BZNEx9BR8+OFmHDmTk8A= -github.com/hashicorp/go-plugin v1.6.0/go.mod h1:lBS5MtSSBZk0SHc66KACcjjlU6WzEVP/8pwz68aMkCI= -github.com/hashicorp/yamux v0.1.1 h1:yrQxtgseBDrq9Y652vSRDvsKCJKOUD+GzTS4Y0Y8pvE= -github.com/hashicorp/yamux v0.1.1/go.mod h1:CtWFDAQgb7dxtzFs4tWbplKIe2jSi3+5vKbgIO0SLnQ= +github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k= +github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M= +github.com/hashicorp/go-plugin v1.6.2 h1:zdGAEd0V1lCaU0u+MxWQhtSDQmahpkwOun8U8EiRVog= +github.com/hashicorp/go-plugin v1.6.2/go.mod h1:CkgLQ5CZqNmdL9U9JzM532t8ZiYQ35+pj3b1FD37R0Q= +github.com/hashicorp/yamux v0.1.2 h1:XtB8kyFOyHXYVFnwT5C3+Bdo8gArse7j2AQ0DA0Uey8= +github.com/hashicorp/yamux v0.1.2/go.mod h1:C+zze2n6e/7wshOZep2A70/aQU6QBRWJO/G6FT1wIns= github.com/jhump/protoreflect v1.15.1 h1:HUMERORf3I3ZdX05WaQ6MIpd/NJ434hTp5YiKgfCL6c= github.com/jhump/protoreflect v1.15.1/go.mod h1:jD/2GMKKE6OqX8qTjhADU1e6DShO+gavG9e0Q693nKo= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= @@ -49,8 +52,6 @@ github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27k github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/mitchellh/go-testing-interface v1.14.1 h1:jrgshOhYAUVNMAJiKbEu7EqAwgJJ2JqpQmpLJOu07cU= -github.com/mitchellh/go-testing-interface v1.14.1/go.mod h1:gfgS7OtZj6MA4U1UrDRp04twqAjfvlZyCfX3sDjEym8= github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= @@ -60,10 +61,11 @@ github.com/oklog/run v1.1.0 h1:GEenZ1cK0+q0+wsJew9qUg/DyD8k3JzYsZAi5gYi2mA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= -github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= +github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= +github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= @@ -73,8 +75,10 @@ github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= -github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= -github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= +github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= +github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto= @@ -83,8 +87,8 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0= go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y= go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8= go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E= -golang.org/x/arch v0.1.0 h1:oMxhUYsO9VsR1dcoVUjJjIGhx1LXol3989T/yZ59Xsw= -golang.org/x/arch v0.1.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= +golang.org/x/arch v0.4.0 h1:A8WCeEWhLwPBKNbFi5Wv5UTCBx5zzubnXDlMOFAzFMc= +golang.org/x/arch v0.4.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= @@ -94,8 +98,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.31.0 h1:68CPQngjLL0r2AlUKiSxtQFKvzRVbnzLwMUn5SzcLHo= +golang.org/x/net v0.31.0/go.mod h1:P4fl1q7dY2hnZFxEk4pPSkDHF+QqjitcnDjUQyMM+pM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -109,12 +113,12 @@ golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.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/sys v0.27.0 h1:wBqf8DvsY9Y/2P8gAfPDEYNuS30J4lPHJxXSb/nJZ+s= +golang.org/x/sys v0.27.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.20.0 h1:gK/Kv2otX8gz+wn7Rmb3vT96ZwuoxnQlY+HlJVj7Qug= +golang.org/x/text v0.20.0/go.mod h1:D4IsuqiFMhST5bX19pQ9ikHC2GsaKyk/oF+pn3ducp4= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= @@ -123,12 +127,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa h1:RBgMaUMP+6soRkik4VoN8ojR2nex2TqZwjSSogic+eo= -google.golang.org/genproto/googleapis/rpc v0.0.0-20240325203815-454cdb8f5daa/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -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 v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= -google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 h1:LWZqQOEjDyONlF1H6afSWpAL/znlREo2tHfLoe+8LMA= +google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697/go.mod h1:5uTbfoYQed2U9p3KIj2/Zzm02PYhndfdmML0qC3q3FU= +google.golang.org/grpc v1.68.0 h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0= +google.golang.org/grpc v1.68.0/go.mod h1:fmSPC5AsjSBCK54MyHRx48kpOti1/jRfOlwEWywNjWA= +google.golang.org/protobuf v1.35.2 h1:8Ar7bF+apOIoThw1EdZl0p1oWvMqTHmpA2fRTyZO8io= +google.golang.org/protobuf v1.35.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= @@ -136,26 +140,25 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc= gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.30.0 h1:siWhRq7cNjy2iHssOB9SCGNCl2spiF1dO3dABqZ8niA= -k8s.io/api v0.30.0/go.mod h1:OPlaYhoHs8EQ1ql0R/TsUgaRPhpKNxIMrKQfWUp8QSE= -k8s.io/apimachinery v0.30.0 h1:qxVPsyDM5XS96NIh9Oj6LavoVFYff/Pon9cZeDIkHHA= -k8s.io/apimachinery v0.30.0/go.mod h1:iexa2somDaxdnj7bha06bhb43Zpa6eWH8N8dbqVjTUc= -k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw= -k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= -k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY= -k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -kusionstack.io/kusion v0.12.0-rc.3.0.20240612063438-7e50571609dc h1:ioSIDfFDXKYz99y+ZBsk4B//Wej6I/pVu2dl8t83lN0= -kusionstack.io/kusion v0.12.0-rc.3.0.20240612063438-7e50571609dc/go.mod h1:ibFycMYFQFuZ/JC7XTTysV4ZKZtVZt8rSkvcoA+3d28= -kusionstack.io/kusion-module-framework v0.2.0 h1:aV6q0lisWF4h8K/i08b1A+CoM89JxUHg//i333AwXTM= -kusionstack.io/kusion-module-framework v0.2.0/go.mod h1:rD5yidwI0WVsgcBYtG2Wxb0ibw4pSTt+53ZCjF880OI= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= -sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= -sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08= +k8s.io/api v0.31.3 h1:umzm5o8lFbdN/hIXbrK9oRpOproJO62CV1zqxXrLgk8= +k8s.io/api v0.31.3/go.mod h1:UJrkIp9pnMOI9K2nlL6vwpxRzzEX5sWgn8kGQe92kCE= +k8s.io/apimachinery v0.31.3 h1:6l0WhcYgasZ/wk9ktLq5vLaoXJJr5ts6lkaQzgeYPq4= +k8s.io/apimachinery v0.31.3/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo= +k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= +k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= +k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078 h1:jGnCPejIetjiy2gqaJ5V0NLwTpF4wbQ6cZIItJCSHno= +k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= +kusionstack.io/kusion-api-go v0.13.0 h1:fDrLkgpkBnG7DTSHmCEfO/aL+iv6FZCTZ4ucxaQSuwg= +kusionstack.io/kusion-api-go v0.13.0/go.mod h1:GlHukjtIyhDSG2hYFbSf+8udzWsCcIQFeLd59+d6L8c= +kusionstack.io/kusion-module-framework v0.2.3-beta.6 h1:0F+zDhelQ337C2QqOovdGhvbprqMc0ABuqv0tvrI9Sc= +kusionstack.io/kusion-module-framework v0.2.3-beta.6/go.mod h1:wdUgPfcDMaoE4tBvzj1diEovJVTvWDry8AedM78gvwk= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= +sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= +sigs.k8s.io/structured-merge-diff/v4 v4.4.3 h1:sCP7Vv3xx/CWIuTPVN38lUPx0uw0lcLfzaiDa8Ja01A= +sigs.k8s.io/structured-merge-diff/v4 v4.4.3/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4= sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E= sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY= diff --git a/src/kawesome_generator.go b/src/kawesome_generator.go index f917b0d..a5d8b25 100644 --- a/src/kawesome_generator.go +++ b/src/kawesome_generator.go @@ -2,19 +2,20 @@ package main import ( "context" + "encoding/json" "errors" "fmt" + "runtime/debug" "strings" "gopkg.in/yaml.v2" v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/intstr" + kusionapiv1 "kusionstack.io/kusion-api-go/api.kusion.io/v1" + "kusionstack.io/kusion-module-framework/pkg/log" "kusionstack.io/kusion-module-framework/pkg/module" "kusionstack.io/kusion-module-framework/pkg/server" - apiv1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1" - "kusionstack.io/kusion/pkg/log" - "kusionstack.io/kusion/pkg/modules" ) func main() { @@ -61,37 +62,48 @@ type RandomPassword struct { // Generate implements the generation logic of kawesome module, including a Kubernetes Service and // a Terraform random_password resource. -func (k *Kawesome) Generate(_ context.Context, request *module.GeneratorRequest) (*module.GeneratorResponse, error) { +func (k *Kawesome) Generate(ctx context.Context, request *module.GeneratorRequest) (response *module.GeneratorResponse, err error) { + // Get the module logger with the generator context. + logger := log.GetModuleLogger(ctx) + logger.Info("Generating resources...") + defer func() { if r := recover(); r != nil { - log.Debugf("failed to generate kawesome module: %v", r) + logger.Debug("failed to generate kawesome module: %v", r) + response = nil + rawRequest, _ := json.Marshal(request) + err = fmt.Errorf("panic in kawesome module generator but recovered with error: [%v] and stack %v and request %v", + r, string(debug.Stack()), string(rawRequest)) } }() // Kawesome module does not exist in AppConfiguration configs. if request.DevConfig == nil { - log.Info("Kawesome module does not exist in AppConfiguration configs") + logger.Info("Kawesome module does not exist in AppConfiguration configs") } // Port should be binded to a Service Workload. - if request.Workload.Service == nil { + if request.Workload == nil { + return nil, errors.New("empty workload") + } else if workloadType, ok := request.Workload["_type"]; !ok || + !strings.Contains(workloadType.(string), ".Service") { return nil, errors.New("port should be binded to a service workload") } // Get the complete kawesome module configs. if err := k.CompleteConfig(request.DevConfig, request.PlatformConfig); err != nil { - log.Debugf("failed to get complete kawesome module configs: %v", err) + logger.Debug("failed to get complete kawesome module configs: %v", err) return nil, err } // Validate the completed kawesome module configs. if err := k.ValidateConfig(); err != nil { - log.Debugf("failed to validate the kawesome module configs: %v", err) + logger.Debug("failed to validate the kawesome module configs: %v", err) return nil, err } - var resources []apiv1.Resource - var patcher *apiv1.Patcher + var resources []kusionapiv1.Resource + var patcher *kusionapiv1.Patcher // Generate the Kubernetes Service related resource. resource, err := k.GenerateServiceResource(request) @@ -115,7 +127,7 @@ func (k *Kawesome) Generate(_ context.Context, request *module.GeneratorRequest) } // CompleteConfig completes the kawesome module configs with both devModuleConfig and platformModuleConfig. -func (k *Kawesome) CompleteConfig(devConfig apiv1.Accessory, platformConfig apiv1.GenericConfig) error { +func (k *Kawesome) CompleteConfig(devConfig kusionapiv1.Accessory, platformConfig kusionapiv1.GenericConfig) error { // Retrieve the config items the developers are concerned about. if devConfig != nil { devCfgYamlStr, err := yaml.Marshal(devConfig) @@ -172,14 +184,14 @@ func (k *Kawesome) ValidateConfig() error { // // Note that we will use the SDK provided by the kusion module framework to wrap the Kubernetes resource // into Kusion resource. -func (k *Kawesome) GenerateServiceResource(request *module.GeneratorRequest) (*apiv1.Resource, error) { +func (k *Kawesome) GenerateServiceResource(request *module.GeneratorRequest) (*kusionapiv1.Resource, error) { // Generate the unique application name with project, stack and app name. - appUniqueName := modules.UniqueAppName(request.Project, request.Stack, request.App) + appUniqueName := module.UniqueAppName(request.Project, request.Stack, request.App) svcType := v1.ServiceTypeClusterIP // Generate the selector for the Service workload with the unique app labels SDK // provided by Kusion. - selector := modules.UniqueAppLabels(request.Project, request.App) + selector := module.UniqueAppLabels(request.Project, request.App) svc := &v1.Service{ TypeMeta: metav1.TypeMeta{ APIVersion: v1.SchemeGroupVersion.String(), @@ -234,7 +246,7 @@ func (k *Kawesome) GenerateServiceResource(request *module.GeneratorRequest) (*a // // Note that we will use the SDK provided by the kusion module framework to wrap the Terraform resource // into Kusion resource. -func (k *Kawesome) GenerateRandomPasswordResource(request *module.GeneratorRequest) (*apiv1.Resource, *apiv1.Patcher, error) { +func (k *Kawesome) GenerateRandomPasswordResource(request *module.GeneratorRequest) (*kusionapiv1.Resource, *kusionapiv1.Patcher, error) { // Set the random_password provider config. randomPasswordPvdCfg := module.ProviderConfig{ Source: "hashicorp/random", @@ -250,7 +262,7 @@ func (k *Kawesome) GenerateRandomPasswordResource(request *module.GeneratorReque // Generate Kusion resource ID & extentions and wrap the Terraform random_password into Kusion resource // with the SDK provided by kusion module framework. - appUniqueName := modules.UniqueAppName(request.Project, request.Stack, request.App) + appUniqueName := module.UniqueAppName(request.Project, request.Stack, request.App) resourceID, err := module.TerraformResourceID(randomPasswordPvdCfg, "random_password", appUniqueName) if err != nil { return nil, nil, err @@ -268,10 +280,10 @@ func (k *Kawesome) GenerateRandomPasswordResource(request *module.GeneratorReque envVars := []v1.EnvVar{ { Name: "KUSION_KAWESOME_RANDOM_PASSWORD", - Value: modules.KusionPathDependency(resourceID, "result"), + Value: module.KusionPathDependency(resourceID, "result"), }, } - patcher := &apiv1.Patcher{ + patcher := &kusionapiv1.Patcher{ Environments: envVars, } diff --git a/src/kawesome_generator_test.go b/src/kawesome_generator_test.go index 23e877a..37bfe92 100644 --- a/src/kawesome_generator_test.go +++ b/src/kawesome_generator_test.go @@ -6,13 +6,12 @@ import ( "github.com/stretchr/testify/assert" v1 "k8s.io/api/core/v1" + kusionapiv1 "kusionstack.io/kusion-api-go/api.kusion.io/v1" "kusionstack.io/kusion-module-framework/pkg/module" - apiv1 "kusionstack.io/kusion/pkg/apis/api.kusion.io/v1" ) func TestKawesomeModule_Generate(t *testing.T) { type args struct { - context context.Context request *module.GeneratorRequest } tests := []struct { @@ -21,6 +20,20 @@ func TestKawesomeModule_Generate(t *testing.T) { want *module.GeneratorResponse wantErr bool }{ + { + name: "Empty workload", + args: args{ + request: &module.GeneratorRequest{ + Project: "kawesome-example", + Stack: "dev", + App: "kawesome", + Workload: nil, + DevConfig: nil, + }, + }, + want: nil, + wantErr: true, + }, { name: "Invalid workload type", args: args{ @@ -28,19 +41,17 @@ func TestKawesomeModule_Generate(t *testing.T) { Project: "kawesome-example", Stack: "dev", App: "kawesome", - Workload: &apiv1.Workload{ - Header: apiv1.Header{ - Type: "Job", - }, - Job: &apiv1.Job{}, + Workload: kusionapiv1.Accessory{ + "_type": "job.Job", + "type": "job", }, - DevConfig: apiv1.Accessory{ - "service": apiv1.Accessory{ + DevConfig: kusionapiv1.Accessory{ + "service": kusionapiv1.Accessory{ "port": 80, "targetPort": 8080, "protocol": "TCP", }, - "randomPassword": apiv1.Accessory{ + "randomPassword": kusionapiv1.Accessory{ "length": 10, }, }, @@ -56,14 +67,12 @@ func TestKawesomeModule_Generate(t *testing.T) { Project: "kawesome-example", Stack: "dev", App: "kawesome", - Workload: &apiv1.Workload{ - Header: apiv1.Header{ - Type: "Service", - }, - Service: &apiv1.Service{}, + Workload: kusionapiv1.Accessory{ + "_type": "service.Service", + "type": "service", }, - DevConfig: apiv1.Accessory{ - "service": apiv1.Accessory{ + DevConfig: kusionapiv1.Accessory{ + "service": kusionapiv1.Accessory{ "port": 0, }, }, @@ -79,14 +88,12 @@ func TestKawesomeModule_Generate(t *testing.T) { Project: "kawesome-example", Stack: "dev", App: "kawesome", - Workload: &apiv1.Workload{ - Header: apiv1.Header{ - Type: "Service", - }, - Service: &apiv1.Service{}, + Workload: kusionapiv1.Accessory{ + "_type": "service.Service", + "type": "service", }, - DevConfig: apiv1.Accessory{ - "service": apiv1.Accessory{ + DevConfig: kusionapiv1.Accessory{ + "service": kusionapiv1.Accessory{ "port": 80, "targetPort": 0, }, @@ -103,14 +110,12 @@ func TestKawesomeModule_Generate(t *testing.T) { Project: "kawesome-example", Stack: "dev", App: "kawesome", - Workload: &apiv1.Workload{ - Header: apiv1.Header{ - Type: "Service", - }, - Service: &apiv1.Service{}, + Workload: kusionapiv1.Accessory{ + "_type": "service.Service", + "type": "service", }, - DevConfig: apiv1.Accessory{ - "service": apiv1.Accessory{ + DevConfig: kusionapiv1.Accessory{ + "service": kusionapiv1.Accessory{ "port": 80, "targetPort": 8080, "protocol": "STCP", @@ -128,19 +133,17 @@ func TestKawesomeModule_Generate(t *testing.T) { Project: "kawesome-example", Stack: "dev", App: "kawesome", - Workload: &apiv1.Workload{ - Header: apiv1.Header{ - Type: "Service", - }, - Service: &apiv1.Service{}, + Workload: kusionapiv1.Accessory{ + "_type": "service.Service", + "type": "service", }, - DevConfig: apiv1.Accessory{ - "service": apiv1.Accessory{ + DevConfig: kusionapiv1.Accessory{ + "service": kusionapiv1.Accessory{ "port": 80, "targetPort": 8080, "protocol": "TCP", }, - "randomPassword": apiv1.Accessory{ + "randomPassword": kusionapiv1.Accessory{ "length": 0, }, }, @@ -156,28 +159,26 @@ func TestKawesomeModule_Generate(t *testing.T) { Project: "kawesome-example", Stack: "dev", App: "kawesome", - Workload: &apiv1.Workload{ - Header: apiv1.Header{ - Type: "Service", - }, - Service: &apiv1.Service{}, + Workload: kusionapiv1.Accessory{ + "_type": "service.Service", + "type": "service", }, - DevConfig: apiv1.Accessory{ - "service": apiv1.Accessory{ + DevConfig: kusionapiv1.Accessory{ + "service": kusionapiv1.Accessory{ "port": 80, "targetPort": 8080, "protocol": "TCP", }, - "randomPassword": apiv1.Accessory{ + "randomPassword": kusionapiv1.Accessory{ "length": 10, }, }, - PlatformConfig: apiv1.GenericConfig{ - "service": apiv1.GenericConfig{ - "labels": apiv1.GenericConfig{ + PlatformConfig: kusionapiv1.GenericConfig{ + "service": kusionapiv1.GenericConfig{ + "labels": kusionapiv1.GenericConfig{ "kusionstack.io/module-name": "kawesome", }, - "annotations": apiv1.GenericConfig{ + "annotations": kusionapiv1.GenericConfig{ "kusionstack.io/module-version": "0.1.0", }, }, @@ -185,7 +186,7 @@ func TestKawesomeModule_Generate(t *testing.T) { }, }, want: &module.GeneratorResponse{ - Resources: []apiv1.Resource{ + Resources: []kusionapiv1.Resource{ { ID: "v1:Service:kawesome-example:kawesome-example-dev-kawesome", Type: "Kubernetes", @@ -229,7 +230,7 @@ func TestKawesomeModule_Generate(t *testing.T) { }, { ID: "hashicorp:random:random_password:kawesome-example-dev-kawesome", - Type: apiv1.Terraform, + Type: kusionapiv1.Terraform, Attributes: map[string]interface{}{ "length": 10, "override_special": "_", @@ -237,12 +238,12 @@ func TestKawesomeModule_Generate(t *testing.T) { }, Extensions: map[string]interface{}{ "provider": "registry.terraform.io/hashicorp/random/3.6.0", - "providerMeta": apiv1.GenericConfig(nil), + "providerMeta": kusionapiv1.GenericConfig(nil), "resourceType": "random_password", }, }, }, - Patcher: &apiv1.Patcher{ + Patcher: &kusionapiv1.Patcher{ Environments: []v1.EnvVar{ { Name: "KUSION_KAWESOME_RANDOM_PASSWORD", @@ -258,7 +259,7 @@ func TestKawesomeModule_Generate(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { o := &Kawesome{} - got, err := o.Generate(tt.args.context, tt.args.request) + got, err := o.Generate(context.Background(), tt.args.request) if (err != nil) != tt.wantErr { t.Errorf("Generate() error = %v, wantErr %v", err, tt.wantErr) return