stranded clair config

Author: thepwagner

testdata/config.toml

@@ -1,5 +1,5 @@
 dryrun          = true
-scanner         = "clair"
+scanner         = "metadata"
 failon          = "high"
 binauth_project = "voucher-binauth"
 metadata_client = "grafeasos"
@@ -22,9 +22,6 @@ password        = "$2a$10$.PaOjV8GdqSHSmUtfolsJeF6LsAq/3CNsFCYGb3IoN/mO9xj1c/yG"
 dir             = "../../testdata/key"
 secrets         = "../../testdata/test.ejson"
 
-[clair]
-address         = "localhost:6060"
-
 [repository.shopify]
 org-url = "https://github.com/Shopify"
 

testdata/test.ejson

@@ -3,10 +3,6 @@
 	"openpgpkeys": {
 		"snakeoil": "EJ[1:EBo602Pk5+unkMVI3tWITyUxCnK3lEUmwY8NpubvQwU=:8H/u+4RmzgxFuFqM7jHYbhquL2rR06PM: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]"
 	},
-	"clair": {
-		"username": "EJ[1:26ZG+VvCz9yteYu+ByWREoHCFDFALwYKbWB/mg7V/SI=:F1DTl/ONP/4deC26j4E/6k7hwOEgM6kT:QYT+gXLNJfQiIQLRpncB1shtndHoI+9Z]",
-		"password": "EJ[1:26ZG+VvCz9yteYu+ByWREoHCFDFALwYKbWB/mg7V/SI=:3z+p+WOMGifBG+eSVP3y6ZcbkiX8YPZK:HFN4rKGWodgyvzaGxm+ysemrJ/m5Fwojs2THkA==]"
-	},
 	"repositories": {
 		"organization-name": {
 			"token": "EJ[1:baVdqII+LlXEsxfHdWZvQCm+Ky8wPCDs8cwkKNMong8=:hOLHIKVcMXDCB8rXJQwHn81kqdiRRr3c:y6G4aJZDDTQb05w3fPLK6/2Us2JdeRyv]"

testdata/test.sops.json

@@ -2,10 +2,6 @@
 	"openpgpkeys": {
 		"snakeoil": "ENC[AES256_GCM,data:dSwVlA==,iv:SqgLfrwjvBwUl0+IZgSo2xkihshUby0NjhZ25ovJ9/k=,tag:xFTjoH82+rEk6RPDWo99ig==,type:str]"
 	},
-	"clair": {
-		"username": "ENC[AES256_GCM,data:Dseq/2ld,iv:+AeBN2t6uLCJf3Is+54ysYURZH48p0qzfgDxm6NuOFs=,tag:eXKPug8Z8GjEIRCkW1dp9Q==,type:str]",
-		"password": "ENC[AES256_GCM,data:WJQJt9HO2yjh,iv:WeYOhymeKJq8dmO/D+LfSYLc4SWCh8MXrm4Ct8zaGYQ=,tag:bNo2L+zgLKYZ09hdQcQDqw==,type:str]"
-	},
 	"repositories": {
 		"organization-name": {
 			"token": "ENC[AES256_GCM,data:cOfWrtqcFfUxMTVBN/XwkQxw1Tfv,iv:ZWR2+haVvIrgvcer2cE1SWmo7BWrwzdPmxAGHovi7+I=,tag:qIZqahCuSLz0JjIJp6fCsw==,type:str]"
@@ -17,8 +13,8 @@
 		"azure_kv": null,
 		"hc_vault": null,
 		"age": null,
-		"lastmodified": "2021-08-27T17:46:11Z",
-		"mac": "ENC[AES256_GCM,data:5R4aSJx6OVjIPwdAqRAF/WpE+HtUR0WX7NsEaHsdNDTH8EsvNJwb4tVLNtobmBiRkVJw9DDff74mBvAcPkQkPnDh0q7BuQNJCtwK09U/hHe2P0FRaXKCSQvAlZJBUIaa5pev42WeQbig2tWtcO7h3NUd3XTvHZmP0a6IZ5F28Jw=,iv:citPjY1kVStd2sS8LRW/KgaQa1tlszve2rJrByfe8lY=,tag:gLT6cNdciPmFIJb62SPM4g==,type:str]",
+		"lastmodified": "2022-10-11T16:39:01Z",
+		"mac": "ENC[AES256_GCM,data:TRf6c/wwBLSLXXZIMc4vLoVEpImb4z/hf3e+uqdfjA9aka0DvbJtEclKhXvq9QAzcJfZBdWteifEeCJFjhqobydaya6tbMIdT66q++uo9+xnxTLx/1/4Gld/+wbm/imGfly5LQz5pcbOgqTRhE578r0q3PF39o+Ws9BIXj1jhME=,iv:geRiEKe5S28yZnXca7KabIAyprLJ77q/wGORb9RFuys=,tag:lnNoQEe2mAotDvuOU05rag==,type:str]",
 		"pgp": [
 			{
 				"created_at": "2021-08-27T17:14:55Z",
@@ -27,6 +23,6 @@
 			}
 		],
 		"unencrypted_suffix": "_unencrypted",
-		"version": "3.7.1"
+		"version": "3.7.3"
 	}
 }

tutorials/cloudrun/config.toml.template

@@ -34,9 +34,6 @@ password = "bcrypt hash of your password"
 dir = "/key"
 secrets = "/etc/voucher/secrets.production.ejson"
 
-[clair]
-address = "localhost:6060"
-
 [statsd]
 addr = "localhost:8125"
 sample_rate = 0.1