diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..a2d8969 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + 1613682818603 + + + + + + + + + + \ No newline at end of file diff --git a/Gopkg.lock b/Gopkg.lock index 8dfe7ea..a1a2a13 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -2,12 +2,12 @@ [[projects]] - digest = "1:d2ccb697dc13c8fbffafa37baae97594d5592ae8f7e113471084137315536e2b" + digest = "1:279540310125d2b219920588d7e2edb2a85b3317b528839166e896ce6b6f211c" name = "github.com/Azure/azure-pipeline-go" packages = ["pipeline"] pruneopts = "UT" - revision = "b8e3409182fd52e74f7d7bdfbff5833591b3b655" - version = "v0.1.8" + revision = "55fedc85a614dcd0e942a66f302ae3efb83d563c" + version = "v0.1.9" [[projects]] digest = "1:c4a5edf3b0f38e709a78dcc945997678a364c2b5adfd48842a3dd349c352f833" @@ -18,10 +18,11 @@ version = "0.3.0" [[projects]] - digest = "1:d8e034bfcaeb6bd8e2be35c16672816d938b71adbf56b86181ad3d0a69f482dc" + digest = "1:1224d4bdbc64466f1a621c35e149bb330852f798799d45b31925ba5e9b1bdfef" name = "github.com/aws/aws-sdk-go" packages = [ "aws", + "aws/arn", "aws/awserr", "aws/awsutil", "aws/client", @@ -31,6 +32,7 @@ "aws/credentials/ec2rolecreds", "aws/credentials/endpointcreds", "aws/credentials/processcreds", + "aws/credentials/ssocreds", "aws/credentials/stscreds", "aws/csm", "aws/defaults", @@ -39,31 +41,44 @@ "aws/request", "aws/session", "aws/signer/v4", + "internal/context", "internal/ini", - "internal/s3err", + "internal/s3shared", + "internal/s3shared/arn", + "internal/s3shared/s3err", "internal/sdkio", + "internal/sdkmath", "internal/sdkrand", "internal/sdkuri", "internal/shareddefaults", + "internal/strings", + "internal/sync/singleflight", + "private/checksum", "private/protocol", "private/protocol/eventstream", "private/protocol/eventstream/eventstreamapi", + "private/protocol/json/jsonutil", + "private/protocol/jsonrpc", "private/protocol/query", "private/protocol/query/queryutil", "private/protocol/rest", + "private/protocol/restjson", "private/protocol/restxml", "private/protocol/xml/xmlutil", "service/s3", "service/s3/s3iface", "service/s3/s3manager", + "service/sso", + "service/sso/ssoiface", "service/sts", + "service/sts/stsiface", ] pruneopts = "UT" - revision = "3991042237b45cf58c9d5f34295942d5533c28c6" - version = "v1.16.11" + revision = "0f5546ef7b2fbdf6d7f4c5848efb339a96a89227" + version = "v1.37.14" [[projects]] - digest = "1:49ea765e340f3907fc52ab1cc23bf9698d2d4fa9db14673710879d2ae2d22a9a" + digest = "1:7232fefaa134b96b0c776fc9307ec282f652fc02abd50559ce3ba718d8a61283" name = "github.com/djherbis/buffer" packages = [ ".", @@ -71,33 +86,38 @@ "wrapio", ] pruneopts = "UT" - revision = "4972e2bf4a27dbd7c43140c959b85e8c1d2f5536" - version = "v1.0" + revision = "c0b8778b64223ece48b4e29eb005c79ebbb8255a" + version = "v1.1.0" [[projects]] - branch = "master" - digest = "1:ecdc8e0fe3bc7d549af1c9c36acf3820523b707d6c071b6d0c3860882c6f7b42" + digest = "1:dcc6aa32431ce33f06ba7f9340ae39127ec8b50bb4cabca08f7691fb105721f2" name = "github.com/docker/spdystream" - packages = [ - ".", - "spdy", - ] + packages = ["."] + pruneopts = "UT" + revision = "dbc715126c0e3fa07721879c6d265b2b82c71e5b" + version = "v0.2.0" + +[[projects]] + digest = "1:6d6cf408abdd97dc5072db9a08372593ab289a9ded27452d465a057a5aeb5407" + name = "github.com/go-logr/logr" + packages = ["."] pruneopts = "UT" - revision = "6480d4af844c189cf5dd913db24ddd339d3a4f85" + revision = "8fc6c73f3911f11de3d0c18ade9880f1114ae72f" + version = "v0.4.0" [[projects]] - digest = "1:34e709f36fd4f868fb00dbaf8a6cab4c1ae685832d392874ba9d7c5dec2429d1" + digest = "1:d77ab821c7131fb47fab54998ea8566aafd3c8f888d230446afdf1cddbf2dfbb" name = "github.com/gogo/protobuf" packages = [ "proto", "sortkeys", ] pruneopts = "UT" - revision = "636bf0302bc95575d69441b25a2603156ffdddf1" - version = "v1.1.1" + revision = "b03c65ea87cdc3521ede29f62fe3ce239267c1bc" + version = "v1.3.2" [[projects]] - digest = "1:4c0989ca0bcd10799064318923b9bc2db6b4d6338dd75f3f2d86c3511aaaf5cf" + digest = "1:0407299779172c3b067809ffbeabf552ed9e4fe03066a80b540979933cc79616" name = "github.com/golang/protobuf" packages = [ "proto", @@ -107,27 +127,30 @@ "ptypes/timestamp", ] pruneopts = "UT" - revision = "aa810b61a9c79d51363740d207bb46cf8e620ed5" - version = "v1.2.0" + revision = "4846b58453b3708320bdb524f25cc5a1d9cda4d4" + version = "v1.4.3" [[projects]] - branch = "master" digest = "1:0bfbe13936953a98ae3cfe8ed6670d396ad81edf069a806d2f6515d7bb6950df" name = "github.com/google/btree" packages = ["."] pruneopts = "UT" revision = "4030bb1f1f0c35b30ca7009e9ebd06849dd45306" + version = "v1.0.0" [[projects]] - branch = "master" - digest = "1:3ee90c0d94da31b442dde97c99635aaafec68d0b8a3c12ee2075c6bdabeec6bb" + digest = "1:39ffe24ca770878a90ea4e2dd516dbc8c2b555b16e72e884c39c92519c195e55" name = "github.com/google/gofuzz" - packages = ["."] + packages = [ + ".", + "bytesource", + ] pruneopts = "UT" - revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" + revision = "379e164120fbc98885a8f494b5aa41ba94f64c56" + version = "v1.2.0" [[projects]] - digest = "1:65c4414eeb350c47b8de71110150d0ea8a281835b1f386eacaa3ad7325929c21" + digest = "1:e35285db21b7d730a52b891a959783e567ca516ea64f2748070f1f917fbccd82" name = "github.com/googleapis/gnostic" packages = [ "OpenAPIv2", @@ -135,27 +158,27 @@ "extensions", ] pruneopts = "UT" - revision = "7c663266750e7d82587642f65e60bc4083f1f84e" - version = "v0.2.0" + revision = "99384834bf8c58ce7ab88db353283bedcb53e1ca" + version = "v0.4.0" [[projects]] branch = "master" - digest = "1:86c1210529e69d69860f2bb3ee9ccce0b595aa3f9165e7dd1388e5c612915888" + digest = "1:5fc0e23b254a1bd7d8d2d42fa093ba33471d08f52fe04afd3713adabb5888dc3" name = "github.com/gregjones/httpcache" packages = [ ".", "diskcache", ] pruneopts = "UT" - revision = "c63ab54fda8f77302f8d414e19933f2b6026a089" + revision = "901d90724c7919163f472a9812253fb26761123d" [[projects]] - digest = "1:8eb1de8112c9924d59bf1d3e5c26f5eaa2bfc2a5fcbb92dc1c2e4546d695f277" + digest = "1:eba10af56a904e7d797ccbdca4a6fae4029537b0118b6582f9f93e025b86af2a" name = "github.com/imdario/mergo" packages = ["."] pruneopts = "UT" - revision = "9f23e2d6bd2a77f959b2bf6acdbefd708a83a4a4" - version = "v0.3.6" + revision = "cd55aeac72a19c6d5826061d5125d72b252a12eb" + version = "v0.3.11" [[projects]] digest = "1:870d441fe217b8e689d7949fef6e43efbc787e50f200cb1e70dbca9204a1d6be" @@ -173,12 +196,20 @@ revision = "c2b33e84" [[projects]] - digest = "1:3e551bbb3a7c0ab2a2bf4660e7fcad16db089fdcfbb44b0199e62838038623ea" + digest = "1:7d7ccfe00918baede5a3daf233bad41bb922692f58a57a687f8b010e207a167b" name = "github.com/json-iterator/go" packages = ["."] pruneopts = "UT" - revision = "1624edc4454b8682399def8740d46db5e4362ba4" - version = "v1.1.5" + revision = "a1ca0830781e007c66b225121d2cdb3a649421f6" + version = "v1.1.10" + +[[projects]] + digest = "1:94ba176e04cc37991c0895bdb5f2acd78bed7939f49abc725e06bd1b18c12422" + name = "github.com/moby/spdystream" + packages = ["spdy"] + pruneopts = "UT" + revision = "dbc715126c0e3fa07721879c6d265b2b82c71e5b" + version = "v0.2.0" [[projects]] digest = "1:33422d238f147d247752996a26574ac48dcf472976eda7f5134015f06bf16563" @@ -196,6 +227,17 @@ revision = "4b7aa43c6742a2c18fdef89dd197aaae7dac7ccd" version = "1.0.1" +[[projects]] + digest = "1:f15ddb763c37d54554e39edd5073dd6a721e8560d73e934ad94305b8a0461c90" + name = "github.com/nuvo/cain" + packages = [ + "pkg/cain", + "pkg/utils", + ] + pruneopts = "UT" + revision = "be0e30d2f2492dde912a165603005b4de2fb7cdc" + version = "0.5.1" + [[projects]] digest = "1:0afbbd82a14657dbe53e816648bd4e76e8267b9bac030851500055baca6f90c5" name = "github.com/nuvo/skbn" @@ -209,47 +251,47 @@ [[projects]] branch = "master" - digest = "1:3bf17a6e6eaa6ad24152148a631d18662f7212e21637c2699bff3369b7f00fa2" + digest = "1:89da0f0574bc94cfd0ac8b59af67bf76cdd110d503df2721006b9f0492394333" name = "github.com/petar/GoLLRB" packages = ["llrb"] pruneopts = "UT" - revision = "53be0d36a84c2a886ca057d34b6aa4468df9ccb4" + revision = "33fb24c13b99c46c93183c291836c573ac382536" [[projects]] - digest = "1:0e7775ebbcf00d8dd28ac663614af924411c868dca3d5aa762af0fae3808d852" + digest = "1:a8c2725121694dfbf6d552fb86fe6b46e3e7135ea05db580c28695b916162aad" name = "github.com/peterbourgon/diskv" packages = ["."] pruneopts = "UT" - revision = "5f041e8faa004a95c88a202771f4cc3e991971e6" - version = "v2.0.1" + revision = "0be1b92a6df0e4f5cb0a5d15fb7f643d0ad93ce6" + version = "v3.0.0" [[projects]] - digest = "1:645cabccbb4fa8aab25a956cbcbdf6a6845ca736b2c64e197ca7cbb9d210b939" + digest = "1:1e80255eea46af2e2db7da90f95e4b5cfe84f3b58d9a8598ec35b0f2a75c60e4" name = "github.com/spf13/cobra" packages = ["."] pruneopts = "UT" - revision = "ef82de70bb3f60c65fb8eebacbb2d122ef517385" - version = "v0.0.3" + revision = "6607e6b8603f56adb027298ee6695e06ffb3a819" + version = "0.0.7" [[projects]] - digest = "1:c1b1102241e7f645bc8e0c22ae352e8f0dc6484b6cb4d132fa9f24174e0119e2" + digest = "1:524b71991fc7d9246cc7dc2d9e0886ccb97648091c63e30eef619e6862c955dd" name = "github.com/spf13/pflag" packages = ["."] pruneopts = "UT" - revision = "298182f68c66c05229eb03ac171abe6e309ee79a" - version = "v1.0.3" + revision = "2e9d26c8c37aae03e3f9d4e90b7116f5accb7cab" + version = "v1.0.5" [[projects]] branch = "master" - digest = "1:3f3a05ae0b95893d90b9b3b5afdb79a9b3d96e4e36e099d841ae602e4aca0da8" + digest = "1:c9d0c7346c55bc13efdb3dbf13938e909d22a7a7bf115af69a79e25553513bd0" name = "golang.org/x/crypto" packages = ["ssh/terminal"] pruneopts = "UT" - revision = "3d3f9f413869b949e48070b5bc593aa22cc2b8f2" + revision = "b8e89b74b9df40d0d1cd96f441924c545d8d0dea" [[projects]] branch = "master" - digest = "1:f7171db635740bd80e33845acf90ca909ff7ecb89967ec1272d8cd01f3f8d1d7" + digest = "1:4642471a39c20e570479fcd40cf675320f6a843c0df0ee165d0fa72962e3743f" name = "golang.org/x/net" packages = [ "context", @@ -260,38 +302,50 @@ "idna", ] pruneopts = "UT" - revision = "88d92db4c548972d942ac2a3531a8a9a34c82ca6" + revision = "5f4716e94777e714bc2fb3e3a44599cb40817aac" [[projects]] branch = "master" - digest = "1:bd33fb266abe5db1fb1c04e58e98192068f05a8d22fae2a9f22270c8422bb331" + digest = "1:7056bda3c3bf85de3edd84044c19644d011620de1686e7fdd358e0b20c7d0e68" name = "golang.org/x/oauth2" packages = [ ".", "internal", ] pruneopts = "UT" - revision = "f42d05182288abf10faef86d16c0d07b8d40ea2d" + revision = "ba52d332ba9961c5b5c1e8fee42614c0f5c2c076" [[projects]] branch = "master" - digest = "1:6a875550c3b582f6c2d7e2ce44aba792511f00016d7c46b0a4fb26f730ef3058" + digest = "1:42de28d2b65fdf90a9dab62c1ac54760e3fbc9af5bf4d4d177bf17f4797c7254" name = "golang.org/x/sys" packages = [ + "internal/unsafeheader", + "plan9", "unix", "windows", ] pruneopts = "UT" - revision = "66b7b1311ac80bbafcd2daeef9a5e6e2cd1e2399" + revision = "8ebf48af031baf6a897cc421197e4d1b168a61de" + +[[projects]] + branch = "master" + digest = "1:aff3723b8ec6c06bb52b62cf492783ae041e137534714289acb6625c031d1b24" + name = "golang.org/x/term" + packages = ["."] + pruneopts = "UT" + revision = "2321bbc49cbf8303ea9834c419750e793e31be73" [[projects]] - digest = "1:a2ab62866c75542dd18d2b069fec854577a20211d7c0ea6ae746072a1dccdd18" + digest = "1:33168e887aff0e3eae823593f38433f28928104925e54a6252937e6e3939f904" name = "golang.org/x/text" packages = [ "collate", "collate/build", "internal/colltab", "internal/gen", + "internal/language", + "internal/language/compact", "internal/tag", "internal/triegen", "internal/ucd", @@ -304,19 +358,19 @@ "unicode/rangetable", ] pruneopts = "UT" - revision = "f21a4dfb5e38f5895301dc265a8def02365cc3d0" - version = "v0.3.0" + revision = "75a595aef632b07c6eeaaa805adb6f0f66e4130e" + version = "v0.3.5" [[projects]] branch = "master" - digest = "1:9fdc2b55e8e0fafe4b41884091e51e77344f7dc511c5acedcfd98200003bff90" + digest = "1:9a12483c63e8328a477280cd6855689af0f584eb580b66c0d113a1f5fe7791b0" name = "golang.org/x/time" packages = ["rate"] pruneopts = "UT" - revision = "85acf8d2951cb2a3bde7632f9ff273ef0379bcbd" + revision = "7e3f01d253248a0a5694eb5b7376dfea18b6397e" [[projects]] - digest = "1:08206298775e5b462e6c0333f4471b44e63f1a70e42952b6ede4ecc9572281eb" + digest = "1:15bbb120d95283019f8891f2762fab3e735075b2cf9b378497277d2fe6c4abca" name = "google.golang.org/appengine" packages = [ "internal", @@ -328,8 +382,46 @@ "urlfetch", ] pruneopts = "UT" - revision = "4a4468ece617fc8205e99368fa2200e9d1fad421" - version = "v1.3.0" + revision = "5d1c1d03f8703c2e81478d9a30e9afa2d3e4bd8a" + version = "v1.6.7" + +[[projects]] + digest = "1:fd328c5b52e433ea3ffc891bcc4f94469a82bf478558208db2b386aad8a304a1" + name = "google.golang.org/protobuf" + packages = [ + "encoding/prototext", + "encoding/protowire", + "internal/descfmt", + "internal/descopts", + "internal/detrand", + "internal/encoding/defval", + "internal/encoding/messageset", + "internal/encoding/tag", + "internal/encoding/text", + "internal/errors", + "internal/fieldsort", + "internal/filedesc", + "internal/filetype", + "internal/flags", + "internal/genid", + "internal/impl", + "internal/mapsort", + "internal/pragma", + "internal/set", + "internal/strs", + "internal/version", + "proto", + "reflect/protoreflect", + "reflect/protoregistry", + "runtime/protoiface", + "runtime/protoimpl", + "types/known/anypb", + "types/known/durationpb", + "types/known/timestamppb", + ] + pruneopts = "UT" + revision = "3f7a61f89bb6813f89d981d1870ed68da0b3c3f1" + version = "v1.25.0" [[projects]] digest = "1:5aebed51f26a49cb77a0c34d1328a0d29839e7a1204b14ff8e26a3df8ec61736" @@ -348,12 +440,12 @@ version = "v0.9.1" [[projects]] - digest = "1:342378ac4dcb378a5448dd723f0784ae519383532f5e70ade24132c4c8693202" + digest = "1:5054a1f394226de9e6ddc47b0ba77e35092a4112f4a1cd9cb94aba1f5bdc3ec6" name = "gopkg.in/yaml.v2" packages = ["."] pruneopts = "UT" - revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183" - version = "v2.2.1" + revision = "7649d4548cb53a614db133b2a8ac1f31859dda8c" + version = "v2.4.0" [[projects]] digest = "1:0d299a04c6472e4458461d7034c76d014cc6f632a3262cbf21d123b19ce13e65" @@ -398,7 +490,7 @@ [[projects]] branch = "release-1.13" - digest = "1:d0727b638acf14f150c5e2bdf70413af1099b7a76d69f4f85ad3049b615d24a3" + digest = "1:2e759b7b44d0fe7680a81548c601c3646d787d03aef5acd808010a72ba70f25e" name = "k8s.io/apimachinery" packages = [ "pkg/api/errors", @@ -442,7 +534,7 @@ "third_party/forked/golang/reflect", ] pruneopts = "UT" - revision = "2b1284ed4c93a43499e781493253e2ac5959c4fd" + revision = "01f8b7d1121a34a7fc9f9c988f4f0b1f00fccb92" [[projects]] digest = "1:92c7b523fffa5badf467754612745bfa8629c4999a44c0c2521c16e2ad50bd2a" @@ -512,25 +604,27 @@ version = "v10.0.0" [[projects]] - digest = "1:e2999bf1bb6eddc2a6aa03fe5e6629120a53088926520ca3b4765f77d7ff7eab" + digest = "1:9f88f0530a7a1580df6aee67064a5896d3c0834a04d3702f989e1f6dbe965835" name = "k8s.io/klog" packages = ["."] pruneopts = "UT" - revision = "a5bc97fbc634d635061f3146511332c7e313a55a" - version = "v0.1.0" + revision = "2427a79a004e759b853799a2e6abb58dc622c363" + version = "v2.5.0" [[projects]] - digest = "1:7719608fe0b52a4ece56c2dde37bedd95b938677d1ab0f84b8a7852e4c59f849" + digest = "1:36d2b2cb1fa6e4a731e38c3582c203213cdbc52c5f202af07db6dc6eeaec88dc" name = "sigs.k8s.io/yaml" packages = ["."] pruneopts = "UT" - revision = "fd68e9863619f6ec2fdd8625fe1f02e7c877e480" - version = "v1.1.0" + revision = "9fc95527decd95bb9d28cc2eab08179b2d0f6971" + version = "v1.2.0" [solve-meta] analyzer-name = "dep" analyzer-version = 1 input-imports = [ + "github.com/nuvo/cain/pkg/cain", + "github.com/nuvo/cain/pkg/utils", "github.com/nuvo/skbn/pkg/skbn", "github.com/spf13/cobra", "k8s.io/apimachinery/pkg/apis/meta/v1", diff --git a/pkg/cain/cqlsh.go b/pkg/cain/cqlsh.go index df29b36..727bcd9 100644 --- a/pkg/cain/cqlsh.go +++ b/pkg/cain/cqlsh.go @@ -127,7 +127,7 @@ func GetMaterializedViews(iK8sClient interface{}, namespace, container, pod, key func Cqlsh(iK8sClient interface{}, namespace, pod, container string, command []string) ([]byte, error) { k8sClient := iK8sClient.(*skbn.K8sClient) - command = append([]string{"cqlsh", "-e"}, command...) + command = append([]string{"cqlsh --ssl", "-e"}, command...) stdout := new(bytes.Buffer) stderr, err := skbn.Exec(*k8sClient, namespace, pod, container, command, nil, stdout) @@ -145,7 +145,7 @@ func Cqlsh(iK8sClient interface{}, namespace, pod, container string, command []s func CqlshF(iK8sClient interface{}, namespace, pod, container string, file string) ([]byte, error) { k8sClient := iK8sClient.(*skbn.K8sClient) - command := []string{"cqlsh", "-f", file} + command := []string{"cqlsh --ssl", "-f", file} stdout := new(bytes.Buffer) stderr, err := skbn.Exec(*k8sClient, namespace, pod, container, command, nil, stdout)