diff --git a/generator/annual-report/sig_report.tmpl b/generator/annual-report/sig_report.tmpl index 475ab1459..2b9206e9b 100644 --- a/generator/annual-report/sig_report.tmpl +++ b/generator/annual-report/sig_report.tmpl @@ -15,8 +15,8 @@ - {{$releases := getReleases}} -3. KEP work in {{lastYear}} (v{{$releases.Latest}}, v{{$releases.LatestMinusOne}}, v{{$releases.LatestMinusTwo}}): {{$owingsig := .Dir}} +3. KEP work in {{lastYear}} (v{{$releases.Latest}}, v{{$releases.LatestMinusOne}}, v{{$releases.LatestMinusTwo}}): {{- range $stage, $keps := filterKEPs $owingsig $releases}} {{ $stage }}: {{- range $keps}} @@ -71,43 +71,62 @@ Include any other ways you measure group membership -## Subprojects +## [Subprojects](https://git.k8s.io/community/{{.Dir}}#subprojects) +{{- define "subprojects" -}} +{{- $owingsig := .Dir -}} +{{- if .New}} - +**New in {{lastYear}}:** +{{range .New}} + - {{.}} +{{- end}} +{{- end}} -New in $YYYY: -- [$subproject-name](https://git.k8s.io/community/$sig-id#$subproject-name) -- +{{- if .Retired}} -Retired in $YYYY: -- [$subproject-name](https://git.k8s.io/community/$sig-id#$subproject-name) -- +**Retired in {{lastYear}}:** +{{range .Retired}} + - {{.}} +{{- end}} +{{- end}} -Continuing: -- [$subproject-name](https://git.k8s.io/community/$sig-id#$subproject-name) -- +{{- if .Continuing}} -## Working groups +**Continuing:** +{{range .Continuing}} + - {{.}} +{{- end}} +{{- end}} +{{- end}} - +{{ template "subprojects" (getCategorizedSubprojects .Dir) }} -New in $YYYY: -- [$wg-name](https://git.k8s.io/community/$wg-id/) ([$YYYY report](https://git.k8s.io/community/$wg-id/annual-report-$YYYY.md)) -- -Retired in $YYYY: -- [$wg-name](https://git.k8s.io/community/$wg-id/) ([$YYYY report](https://git.k8s.io/community/$wg-id/annual-report-$YYYY.md)) -- +## [Working groups](https://git.k8s.io/community/{{.Dir}}#working-groups) +{{ $categorizedWorkingGroups := getCategorizedWorkingGroups .Dir }} +{{- if $categorizedWorkingGroups.New}} -Continuing: -- [$wg-name](https://git.k8s.io/community/$wg-id/) ([$YYYY report](https://git.k8s.io/community/$wg-id/annual-report-$YYYY.md)) -- +**New in {{lastYear}}:** +{{range $categorizedWorkingGroups.New }} + - {{.}} +{{- end}} +{{- end}} + +{{- if $categorizedWorkingGroups.Retired}} + +**Retired in {{lastYear}}:** +{{range $categorizedWorkingGroups.Retired }} + - {{.}} +{{- end}} +{{- end}} + +{{- if $categorizedWorkingGroups.Continuing}} + +**Continuing:** +{{range $categorizedWorkingGroups.Continuing }} + - {{ . }} +{{- end}} +{{- end}} ## Operational diff --git a/generator/app.go b/generator/app.go index 6d6313434..09986697c 100644 --- a/generator/app.go +++ b/generator/app.go @@ -20,6 +20,7 @@ import ( "context" "encoding/json" "fmt" + "io" "io/ioutil" "log" "net/http" @@ -28,6 +29,7 @@ import ( "path/filepath" "regexp" "sort" + "strconv" "strings" "text/template" "time" @@ -36,6 +38,10 @@ import ( "github.com/google/go-github/v32/github" + "github.com/go-git/go-git/v5" + "github.com/go-git/go-git/v5/plumbing" + "github.com/go-git/go-git/v5/storage/memory" + yaml "gopkg.in/yaml.v3" ) @@ -65,25 +71,23 @@ const ( // For KEPs automation kepURL = "https://storage.googleapis.com/k8s-keps/keps.json" + // For Subprojects automation + communityRepoURL = "https://github.com/kubernetes/community.git" + localRepoPath = "." ) var ( - baseGeneratorDir = "" - templateDir = "generator" - releases = Releases{} - cachedKEPs = []api.Proposal{} + baseGeneratorDir = "" + templateDir = "generator" + releases = Releases{} + cachedKEPs = []api.Proposal{} + repo = &git.Repository{} + annualReportYear = time.Time{} + currentYear = time.Time{} + commitFromAnnualReportYear = &plumbing.Hash{} + commitFromCurrentYear = &plumbing.Hash{} ) -// KEP represents an individual KEP holding its metadata information. -type KEP struct { - Name string `json:"name"` - Title string `json:"title"` - KepNumber string `json:"kepNumber"` - OwningSig string `json:"owningSig"` - Stage string `json:"stage"` - LatestMilestone string `json:"latestMilestone"` -} - type Releases struct { Latest string LatestMinusOne string @@ -524,16 +528,18 @@ func getExistingContent(path string, fileFormat string) (string, error) { } var funcMap = template.FuncMap{ - "tzUrlEncode": tzURLEncode, - "trimSpace": strings.TrimSpace, - "trimSuffix": strings.TrimSuffix, - "githubURL": githubURL, - "orgRepoPath": orgRepoPath, - "now": time.Now, - "lastYear": lastYear, - "toUpper": strings.ToUpper, - "filterKEPs": filterKEPs, - "getReleases": getReleases, + "tzUrlEncode": tzURLEncode, + "trimSpace": strings.TrimSpace, + "trimSuffix": strings.TrimSuffix, + "githubURL": githubURL, + "orgRepoPath": orgRepoPath, + "now": time.Now, + "lastYear": lastYear, + "toUpper": strings.ToUpper, + "filterKEPs": filterKEPs, + "getReleases": getReleases, + "getCategorizedSubprojects": getCategorizedSubprojects, + "getCategorizedWorkingGroups": getCategorizedWorkingGroups, } // lastYear returns the last year as a string @@ -784,10 +790,230 @@ func writeYaml(data interface{}, path string) error { return enc.Encode(data) } -func main() { +// get the first commit on a given date +func getCommitByDate(repo *git.Repository, date time.Time) (*plumbing.Hash, error) { + // Get the commit iterator + iterator, err := repo.Log(&git.LogOptions{Order: git.LogOrderCommitterTime}) + if err != nil { + return nil, err + } - // Fetch KEPs and cache them in the keps variable - err := fetchKEPs() + // Iterate through the commits + var commit *plumbing.Hash + for { + // Get the next commit + c, err := iterator.Next() + if err != nil { + if err == io.EOF { + break + } + return nil, err + } + + // Check if the commit date is less than or equal to the specified date + if c.Committer.When.Before(date) || c.Committer.When.Equal(date) { + commit = &c.Hash + break + } + } + + return commit, nil +} + +// get the "sigs.yaml" file from a given commit +func getFileFromCommit(repo *git.Repository, commit *plumbing.Hash, filename string) ([]byte, error) { + // Get the commit object + obj, err := repo.CommitObject(*commit) + if err != nil { + return nil, err + } + + // Get the commit tree + tree, err := obj.Tree() + if err != nil { + return nil, err + } + + // Get the file from the tree + entry, err := tree.FindEntry(filename) + if err != nil { + return nil, err + } + + // Get the file content + file, err := repo.BlobObject(entry.Hash) + if err != nil { + return nil, err + } + + reader, err := file.Reader() + if err != nil { + return nil, err + } + defer reader.Close() + + content, err := ioutil.ReadAll(reader) + if err != nil { + return nil, err + } + + return content, nil +} + +func getSigsYamlFromCommit(repo *git.Repository, commitFromAnnualReportYear, commitFromCurrentYear plumbing.Hash) (Context, Context, error) { + var annualReportYearSigs, currentYearSigs Context + + annualReportYearSigFile, err := getFileFromCommit(repo, &commitFromAnnualReportYear, sigsYamlFile) + if err != nil { + return Context{}, Context{}, err + } + err = yaml.Unmarshal([]byte(annualReportYearSigFile), &annualReportYearSigs) + if err != nil { + return Context{}, Context{}, err + } + + currentYearSigFile, err := getFileFromCommit(repo, &commitFromCurrentYear, sigsYamlFile) + if err != nil { + return Context{}, Context{}, err + } + err = yaml.Unmarshal([]byte(currentYearSigFile), ¤tYearSigs) + if err != nil { + return Context{}, Context{}, err + } + + return annualReportYearSigs, currentYearSigs, nil +} + +func contains(strlist []string, val string) bool { + for _, str := range strlist { + if str == val { + return true + } + } + return false +} + +func getCategorizedSubprojects(dir string) (map[string][]string, error) { + subprojectsMap := make(map[string][]string) + // set for the subprojects in the annual year + annualSubprojects := make(map[string]bool) + + annualReportYearSigs, currentYearSigs, err := getSigsYamlFromCommit(repo, *commitFromAnnualReportYear, *commitFromCurrentYear) + if err != nil { + return nil, err + } + + // iterate over sigs from the annual report year (say 2022) + for _, sig1 := range annualReportYearSigs.Sigs { + if sig1.Dir != dir { + continue + } + for _, sub1 := range sig1.Subprojects { + annualSubprojects[sub1.Name] = true + } + } + + // iterate over sigs from the current year (say 2023) + for _, sig2 := range currentYearSigs.Sigs { + if sig2.Dir != dir { + continue + } + for _, sub2 := range sig2.Subprojects { + if annualSubprojects[sub2.Name] { + subprojectsMap["Continuing"] = append(subprojectsMap["Continuing"], sub2.Name) + delete(annualSubprojects, sub2.Name) + } else { + subprojectsMap["New"] = append(subprojectsMap["New"], sub2.Name) + } + } + } + + for sub := range annualSubprojects { + subprojectsMap["Retired"] = append(subprojectsMap["Retired"], sub) + } + + return subprojectsMap, nil +} + +func getCategorizedWorkingGroups(dir string) (map[string][]string, error) { + workingGroupsMap := make(map[string][]string) + + // set for the working groups in the annual year + annualWGs := make(map[string]bool) + annualReportYearSigs, currentYearSigs, err := getSigsYamlFromCommit(repo, *commitFromAnnualReportYear, *commitFromCurrentYear) + if err != nil { + return nil, err + } + + annualReportYearSigs.Complete() + annualReportYearSigs.Sort() + currentYearSigs.Complete() + currentYearSigs.Sort() + + // iterate over the ReportingWGs from the annual report year (say 2022) + for _, sig := range annualReportYearSigs.Sigs { + if sig.Dir != dir { + continue + } + for _, wg := range sig.ReportingWGs { + annualWGs[string(wg)] = true + } + } + + // iterate over the ReportingWGs from the current year (say 2023) + for _, sig := range currentYearSigs.Sigs { + if sig.Dir != dir { + continue + } + for _, newWG := range sig.ReportingWGs { + if _, ok := annualWGs[string(newWG)]; !ok { + workingGroupsMap["New"] = append(workingGroupsMap["New"], string(newWG)) + } else { + workingGroupsMap["Continuing"] = append(workingGroupsMap["Continuing"], string(newWG)) + delete(annualWGs, string(newWG)) + } + } + } + + for wg := range annualWGs { + workingGroupsMap["Retired"] = append(workingGroupsMap["Retired"], string(wg)) + } + + return workingGroupsMap, nil +} + +func main() { + // prep for automated listing of subprojects in the annual report + intLastYear, err := strconv.Atoi(lastYear()) + if err != nil { + log.Fatal(err) + } + annualReportYear = time.Date(intLastYear, time.January, 1, 0, 0, 0, 0, time.UTC) + currentYear = time.Date(intLastYear+1, time.January, 1, 0, 0, 0, 0, time.UTC) + + repo, err = git.PlainOpen(localRepoPath) + if err != nil { + if err == git.ErrRepositoryNotExists { + repo, err = git.Clone(memory.NewStorage(), nil, &git.CloneOptions{ + URL: communityRepoURL, + }) + } else { + log.Fatal(err) + } + } + + commitFromAnnualReportYear, err = getCommitByDate(repo, annualReportYear) + if err != nil { + log.Fatal(err) + } + + commitFromCurrentYear, err = getCommitByDate(repo, currentYear) + if err != nil { + log.Fatal(err) + } + + // fetch KEPs and cache them in the keps variable + err = fetchKEPs() if err != nil { log.Fatal(err) } diff --git a/go.mod b/go.mod index a333b394f..dffc76114 100644 --- a/go.mod +++ b/go.mod @@ -4,18 +4,30 @@ go 1.18 require ( github.com/client9/misspell v0.3.4 + github.com/go-git/go-git/v5 v5.2.0 github.com/google/go-github/v32 v32.1.0 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c k8s.io/enhancements v0.0.0-20230113204613-7f681415a001 ) require ( + github.com/emirpasic/gods v1.12.0 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-git/go-billy/v5 v5.0.0 // indirect github.com/go-playground/locales v0.13.0 // indirect github.com/go-playground/universal-translator v0.17.0 // indirect github.com/go-playground/validator/v10 v10.4.1 // indirect github.com/google/go-querystring v1.0.0 // indirect + github.com/imdario/mergo v0.3.11 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect github.com/leodido/go-urn v1.2.1 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/pkg/errors v0.9.1 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/xanzy/ssh-agent v0.2.1 // indirect golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 // indirect + golang.org/x/net v0.0.0-20201224014010-6772e930b67b // indirect golang.org/x/sys v0.0.0-20210112080510-489259a85091 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect ) diff --git a/go.sum b/go.sum index 949853733..1475c5739 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,28 @@ +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs= +github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= +github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio= +github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs= github.com/client9/misspell v0.3.4 h1:ta993UF76GwbvJcIo3Y68y/M3WxlpEHPWIGDkJYwzJI= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= 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/emirpasic/gods v1.12.0 h1:QAUIPSaCu4G+POclxeqb3F+WPpdKqFGlw36+yOzGlrg= +github.com/emirpasic/gods v1.12.0/go.mod h1:YfzfFFoVP/catgzJb4IKIqXjX78Ha8FMSDh3ymbK86o= +github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= +github.com/gliderlabs/ssh v0.2.2 h1:6zsha5zo/TWhRhwqCD3+EarCAgZ2yN28ipRnGPnwkI0= +github.com/gliderlabs/ssh v0.2.2/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= +github.com/go-git/gcfg v1.5.0 h1:Q5ViNfGF8zFgyJWPqYwA7qGFoMTEiBmdlkcfRmpIMa4= +github.com/go-git/gcfg v1.5.0/go.mod h1:5m20vg6GwYabIxaOonVkTdrILxQMpEShl1xiMF4ua+E= +github.com/go-git/go-billy/v5 v5.0.0 h1:7NQHvd9FVid8VL4qVUMm8XifBK+2xCoZ2lSk0agRrHM= +github.com/go-git/go-billy/v5 v5.0.0/go.mod h1:pmpqyWchKfYfrkb/UVH4otLvyi/5gJlGI4Hb3ZqZ3W0= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12 h1:PbKy9zOy4aAKrJ5pibIRpVO2BXnK1Tlcg+caKI7Ox5M= +github.com/go-git/go-git-fixtures/v4 v4.0.2-0.20200613231340-f56387b50c12/go.mod h1:m+ICp2rF3jDhFgEZ/8yziagdT1C+ZpZcrJjappBCDSw= +github.com/go-git/go-git/v5 v5.2.0 h1:YPBLG/3UK1we1ohRkncLjaXWLW+HKp5QNM/jTli2JgI= +github.com/go-git/go-git/v5 v5.2.0/go.mod h1:kh02eMX+wdqqxgNMEyq8YgwlIOsDOa9homkUq1PoTMs= github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= @@ -11,39 +32,81 @@ github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+ github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-github/v32 v32.1.0 h1:GWkQOdXqviCPx7Q7Fj+KyPoGm4SwHRh8rheoPhd27II= github.com/google/go-github/v32 v32.1.0/go.mod h1:rIEpZD9CTDQwDK9GDrtMTycQNA4JU3qBsCizh3q2WCI= github.com/google/go-querystring v1.0.0 h1:Xkwi/a1rcvNg1PPYe5vI8GbeBY/jrVuDX5ASuANWTrk= github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/imdario/mergo v0.3.9/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= +github.com/imdario/mergo v0.3.11 h1:3tnifQM4i+fbajXKBHXWEH+KvNHqojZ778UH75j3bGA= +github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 h1:BQSFePA1RWJOlocH6Fxy8MmwDt+yVQYULKfN0RoTN8A= +github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99/go.mod h1:1lJo3i6rXxKeerYnT8Nvf0QmHCRC1n8sfWVwXF2Frvo= +github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd h1:Coekwdh0v2wtGp9Gmz1Ze3eVRAWJMLokvN3QjdzCHLY= +github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= +github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= 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/sergi/go-diff v1.1.0 h1:we8PVUC3FE2uYfodKH/nBHMSetSfHDR6scGdBi+erh0= +github.com/sergi/go-diff v1.1.0/go.mod h1:STckp+ISIX8hZLjrqAeVduY0gWCT9IjLuqbuNXdaHfM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY= +github.com/xanzy/ssh-agent v0.2.1 h1:TCbipTQL2JiiCprBWx9frJ2eJlCYT00NmctrHxVAr70= +github.com/xanzy/ssh-agent v0.2.1/go.mod h1:mLlQY/MoOhWBj+gOGMQkOeiEvkx+8pJSI+0Bx9h2kr4= +golang.org/x/crypto v0.0.0-20190219172222-a4c6cb3142f2/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0 h1:hb9wdF1z5waM+dSIICn1l0DkLVDT3hqhhQsDNUmHPRE= golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b h1:iFwSg7t5GZmB/Q5TjiEAsdoLDrdJRC1RiF2WhuV29Qw= +golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190221075227-b4e8571b14e0/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091 h1:DMyOG0U+gKfu8JZzg2UQe9MeaC1X+xQWlAKcRnjxjCw= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU= +gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME= +gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= k8s.io/enhancements v0.0.0-20230113204613-7f681415a001 h1:WIc9tKwNWdlFwmEMzK8rX5DVpxmKQPo8LA0yyKroxxs=