From a0d5dcf658f3956944635cbf8249c9f1417929f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Casta=C3=B1o=20Arteaga?= Date: Mon, 20 Nov 2023 16:21:37 +0100 Subject: [PATCH] Add CD foundation (#1343) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Sergio Castaño Arteaga Signed-off-by: Cintia Sanchez Garcia Co-authored-by: Sergio Castaño Arteaga Co-authored-by: Cintia Sanchez Garcia --- .github/workflows/ci.yml | 4 +- README.md | 2 +- clomonitor-registrar/src/registrar.rs | 2 +- clomonitor-tracker/src/tracker.rs | 2 +- data/cdf.yaml | 223 ++++++++++++++++++ web/package.json | 2 +- web/src/data.tsx | 12 +- .../search/__snapshots__/index.test.tsx.snap | 62 +++++ .../filters/__snapshots__/index.test.tsx.snap | 31 +++ .../stats/__snapshots__/index.test.tsx.snap | 5 + web/yarn.lock | 6 +- 11 files changed, 341 insertions(+), 10 deletions(-) create mode 100644 data/cdf.yaml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e5d221a3..653dbbc5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,7 +15,7 @@ jobs: - name: Setup Rust uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.74.0 profile: minimal components: clippy, rustfmt override: true @@ -64,7 +64,7 @@ jobs: - name: Setup Rust uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: 1.74.0 profile: minimal override: true - name: Run backend tests diff --git a/README.md b/README.md index 5e659845..348dbd7c 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ ## Projects -[clomonitor.io](https://clomonitor.io) lists most of the projects in the [CNCF](https://www.cncf.io/projects/) and [LF AI & DATA](https://lfaidata.foundation/projects/) foundations. If you notice that a project that belongs to any of those foundations is missing or has some incorrect or missing information, please feel free to submit a pull request with your suggested changes. The YAML data files for the registered foundations can be found in this repository, at the [/data](https://github.com/cncf/clomonitor/tree/main/data) path. **CLOMonitor** checks periodically those data files and applies the corresponding changes as needed. +[clomonitor.io](https://clomonitor.io) lists most of the projects in the [CNCF](https://www.cncf.io/projects/), [LF AI & DATA](https://lfaidata.foundation/projects/) and [CDF](https://cd.foundation/projects/) foundations. If you notice that a project that belongs to any of those foundations is missing or has some incorrect or missing information, please feel free to submit a pull request with your suggested changes. The YAML data files for the registered foundations can be found in this repository, at the [/data](https://github.com/cncf/clomonitor/tree/main/data) path. **CLOMonitor** checks periodically those data files and applies the corresponding changes as needed. Every project featured on [clomonitor.io](https://clomonitor.io) will be provided with a badge and report summary that is ready for use in your project repos. Simply click the menu dropdown on your project page and copy+paste the code snippet into your markdown as desired. An example can be seen in the [image shown above](docs/screenshots/embed-report-light.png). diff --git a/clomonitor-registrar/src/registrar.rs b/clomonitor-registrar/src/registrar.rs index a08e0908..3f334f03 100644 --- a/clomonitor-registrar/src/registrar.rs +++ b/clomonitor-registrar/src/registrar.rs @@ -112,7 +112,7 @@ pub(crate) async fn run(cfg: &Config, db: DynDB) -> Result<()> { |final_result, task_result| match task_result { Ok(()) => final_result, Err(task_err) => match final_result { - Ok(()) => Err(task_err).map_err(Into::into), + Ok(()) => Err(Into::into(task_err)), Err(final_err) => Err(format_err!("{:#}\n{:#}", final_err, task_err)), }, }, diff --git a/clomonitor-tracker/src/tracker.rs b/clomonitor-tracker/src/tracker.rs index 8fba5add..2e7594e6 100644 --- a/clomonitor-tracker/src/tracker.rs +++ b/clomonitor-tracker/src/tracker.rs @@ -91,7 +91,7 @@ pub(crate) async fn run(cfg: &Config, db: DynDB, git: DynGit, linter: DynLinter) |final_result, task_result| match task_result { Ok(()) => final_result, Err(task_err) => match final_result { - Ok(()) => Err(task_err).map_err(Into::into), + Ok(()) => Err(Into::into(task_err)), Err(final_err) => Err(format_err!("{:#}\n{:#}", final_err, task_err)), }, }, diff --git a/data/cdf.yaml b/data/cdf.yaml new file mode 100644 index 00000000..f05a4040 --- /dev/null +++ b/data/cdf.yaml @@ -0,0 +1,223 @@ +- name: tekton + display_name: Tekton + description: A cloud-native Pipeline resource + category: CI & Pipeline Orchestration + logo_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/tekton/icon/color/tekton-icon-color.svg + logo_dark_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/tekton/icon/white/tekton-icon-white.svg + devstats_url: https://tekton.devstats.cd.foundation + maturity: graduated + repositories: + - name: community + url: https://github.com/tektoncd/community + check_sets: + - community + - name: pipeline + url: https://github.com/tektoncd/pipeline + check_sets: + - code + - name: cli + url: https://github.com/tektoncd/cli + check_sets: + - code-lite + - name: operator + url: https://github.com/tektoncd/operator + check_sets: + - code-lite + - name: website + url: https://github.com/tektoncd/website + check_sets: + - docs +- name: jenkinsx + display_name: Jenkins X + description: Jenkins X provides automated CI+CD for Kubernetes with Preview Environments on Pull Requests using Cloud Native pipelines from Tekton + category: CI & Pipeline Orchestration + logo_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/jenkinsx/icon/color/jenkinsx-icon-color.svg + devstats_url: https://jenkinsx.devstats.cd.foundation + maturity: incubating + repositories: + - name: jx-community + url: https://github.com/jenkins-x/jx-community + check_sets: + - community + - name: jx + url: https://github.com/jenkins-x/jx + check_sets: + - code + - name: jx-docs + url: https://github.com/jenkins-x/jx-docs + check_sets: + - docs + - name: lighthouse + url: https://github.com/jenkins-x/lighthouse + check_sets: + - code-lite +- name: screwdriver + display_name: Screwdriver + description: An open source build platform designed for continuous delivery + category: CI & Pipeline Orchestration + logo_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/screwdriver/icon/color/screwdriver-icon-color.svg + logo_dark_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/screwdriver/icon/white/screwdriver-icon-white.svg + devstats_url: https://screwdrivercd.devstats.cd.foundation + maturity: incubating + repositories: + - name: screwdriver + url: https://github.com/screwdriver-cd/screwdriver + check_sets: + - community + - code + - name: guide + url: https://github.com/screwdriver-cd/guide + check_sets: + - docs +- name: spinnaker + display_name: Spinnaker + description: Spinnaker is an open source, multi-cloud continuous delivery platform for releasing software changes with high velocity and confidence. + category: CI & Pipeline Orchestration + logo_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/spinnaker/icon/color/spinnaker-icon-color.svg + devstats_url: https://spinnaker.devstats.cd.foundation + maturity: incubating + repositories: + - name: governance + url: https://github.com/spinnaker/governance + check_sets: + - community + - name: spinakker + url: https://github.com/spinnaker/spinnaker + check_sets: + - code + - name: clouddriver + url: https://github.com/spinnaker/clouddriver + check_sets: + - code-lite + - name: deck + url: https://github.com/spinnaker/deck + check_sets: + - docs + - name: igor + url: https://github.com/spinnaker/igor + check_sets: + - code-lite + - name: gate + url: https://github.com/spinnaker/gate + check_sets: + - code-lite +- name: jenkins + display_name: Jenkins + description: Jenkins automation server + category: CI & Pipeline Orchestration + logo_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/jenkins/icon/color/jenkins-icon-color.svg + devstats_url: https://jenkins.devstats.cd.foundation + maturity: graduated + repositories: + - name: jenkins + url: https://github.com/jenkinsci/jenkins + check_sets: + - community + - code + - name: docker + url: https://github.com/jenkinsci/docker + check_sets: + - code-lite + - name: helm-charts + url: https://github.com/jenkinsci/helm-charts + check_sets: + - code-lite + - name: configuration-as-code-plugin + url: https://github.com/jenkinsci/configuration-as-code-plugin + check_sets: + - code-lite +- name: ortelius + display_name: Ortelius + description: Ortelius is a microservice catalog that centralizes supply chain and DevOps Intelligence into one location. Use Ortelius to expose microservice version drift across clusters, aggregate SBOMs to 'logical' applications and track microservice usage across teams and environments + category: Config & Library Management + logo_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/ortelius/icon/color/ortelius-icon-color.svg + devstats_url: https://ortelius.devstats.cd.foundation + maturity: incubating + repositories: + - name: ortelius + url: https://github.com/ortelius/ortelius + check_sets: + - community + - code + - name: ortelius-charts + url: https://github.com/ortelius/ortelius-charts + check_sets: + - code-lite + - name: ortelius-docs + url: https://github.com/ortelius/ortelius-docs + check_sets: + - docs +- name: pyrsia + display_name: Pyrsia + description: Decentralized Package Network + category: Config & Library Management + logo_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/pyrsia/artwork/icon-pyrsia-torch-175.svg + devstats_url: https://pyrsia.devstats.cd.foundation/ + maturity: incubating + repositories: + - name: pyrsia + url: https://github.com/pyrsia/pyrsia + check_sets: + - community + - code + - name: pyrsia.github.io + url: https://github.com/pyrsia/pyrsia.github.io + check_sets: + - docs + - name: killercoda + url: https://github.com/pyrsia/killercoda + check_sets: + - code-lite +- name: shipwright + display_name: Shipwright + description: A framework for building container images on Kubernetes + category: Container Registry & Build + logo_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/shipwright/icon/color/shipwright-icon-color.svg + devstats_url: https://shipwright.devstats.cd.foundation/ + maturity: incubating + repositories: + - name: community + url: https://github.com/shipwright-io/community + check_sets: + - community + - name: build + url: https://github.com/shipwright-io/build + check_sets: + - code + - name: operator + url: https://github.com/shipwright-io/operator + check_sets: + - code-lite + - name: triggers + url: https://github.com/shipwright-io/triggers + check_sets: + - code-lite + - name: cli + url: https://github.com/shipwright-io/cli + check_sets: + - code-lite + - name: website + url: https://github.com/shipwright-io/website + check_sets: + - docs +- name: cdevents + display_name: CDEvents + description: CDEvents are a common specification for Continuous Delivery events, enabling interoperability in the complete software production ecosystem + category: Observability and Analysis + logo_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/cdevents/icon/color/cdevents_icon-color.svg + logo_dark_url: https://raw.githubusercontent.com/cdfoundation/artwork/main/cdevents/icon/white/cdevents_icon-white.svg + devstats_url: https://cdevents.devstats.cd.foundation/ + maturity: incubating + repositories: + - name: community + url: https://github.com/cdevents/community + check_sets: + - community + - name: spec + url: https://github.com/cdevents/spec + check_sets: + - code + - name: cdevents.dev + url: https://github.com/cdevents/cdevents.dev + check_sets: + - docs diff --git a/web/package.json b/web/package.json index 0e86c3ef..a81fd07e 100644 --- a/web/package.json +++ b/web/package.json @@ -5,7 +5,7 @@ "dependencies": { "apexcharts": "^3.44.0", "classnames": "^2.3.2", - "clo-ui": "https://github.com/cncf/clo-ui.git#v0.1.18", + "clo-ui": "https://github.com/cncf/clo-ui.git#v0.1.19", "lodash": "^4.17.21", "moment": "^2.29.1", "nth-check": "^2.0.1", diff --git a/web/src/data.tsx b/web/src/data.tsx index a80c9b7b..28c90a97 100644 --- a/web/src/data.tsx +++ b/web/src/data.tsx @@ -48,6 +48,7 @@ export const FILTERS: FiltersSection[] = [ name: FilterKind.Foundation, title: 'Foundation', filters: [ + { name: Foundation.cdf, label: 'CDF' }, { name: Foundation.cncf, label: 'CNCF' }, { name: Foundation.lfaidata, label: 'LF AI & Data' }, ], @@ -173,7 +174,6 @@ export const QUERIES: SampleQuery[] = [ filters: { foundation: ['cncf'] }, }, }, - { name: 'Projects accepted by LF AI & Data', filters: { @@ -181,6 +181,13 @@ export const QUERIES: SampleQuery[] = [ filters: { category: ['lfaidata'] }, }, }, + { + name: 'Projects accepted by CDF', + filters: { + pageNumber: 1, + filters: { category: ['cdf'] }, + }, + }, ]; export const CATEGORY_ICONS = { @@ -499,6 +506,9 @@ export const REPORT_OPTIONS: ReportOptionInfo = { }; export const FOUNDATIONS = { + [Foundation.cdf]: { + name: 'CDF', + }, [Foundation.cncf]: { name: 'CNCF', }, diff --git a/web/src/layout/search/__snapshots__/index.test.tsx.snap b/web/src/layout/search/__snapshots__/index.test.tsx.snap index 47708047..ca0a051b 100644 --- a/web/src/layout/search/__snapshots__/index.test.tsx.snap +++ b/web/src/layout/search/__snapshots__/index.test.tsx.snap @@ -97,6 +97,37 @@ exports[`Project detail index creates snapshot 1`] = `
+
+ + +
@@ -2214,6 +2245,37 @@ exports[`Project detail index creates snapshot 1`] = `
+
+ + +
diff --git a/web/src/layout/search/filters/__snapshots__/index.test.tsx.snap b/web/src/layout/search/filters/__snapshots__/index.test.tsx.snap index 095c7dbb..488633f6 100644 --- a/web/src/layout/search/filters/__snapshots__/index.test.tsx.snap +++ b/web/src/layout/search/filters/__snapshots__/index.test.tsx.snap @@ -21,6 +21,37 @@ exports[`Filters creates snapshot 1`] = `
+
+ + +
diff --git a/web/src/layout/stats/__snapshots__/index.test.tsx.snap b/web/src/layout/stats/__snapshots__/index.test.tsx.snap index 725b46e6..5eab7fa2 100644 --- a/web/src/layout/stats/__snapshots__/index.test.tsx.snap +++ b/web/src/layout/stats/__snapshots__/index.test.tsx.snap @@ -58,6 +58,11 @@ exports[`StatsView creates snapshot 1`] = ` > All +