From 57ae8672201bd6b3359c2543e3268bb502af3d9b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 3 Jul 2024 14:25:40 -0700 Subject: [PATCH 1/4] build(deps): Bump golang.org/x/net (#11) Bumps the go_modules group with 1 update in the / directory: [golang.org/x/net](https://github.com/golang/net). Updates `golang.org/x/net` from 0.22.0 to 0.23.0 - [Commits](https://github.com/golang/net/compare/v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect dependency-group: go_modules ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 89e1d64..65050ae 100644 --- a/go.mod +++ b/go.mod @@ -64,7 +64,7 @@ require ( go4.org/netipx v0.0.0-20231129151722-fdeea329fbba // indirect golang.org/x/crypto v0.21.0 // indirect golang.org/x/mod v0.16.0 // indirect - golang.org/x/net v0.22.0 // indirect + golang.org/x/net v0.23.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/tools v0.19.0 // indirect diff --git a/go.sum b/go.sum index 78e75a3..014a077 100644 --- a/go.sum +++ b/go.sum @@ -262,8 +262,8 @@ golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= 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= From a6cd5cc9884ad4cf149b35544c2d004bda277e58 Mon Sep 17 00:00:00 2001 From: Felicitas Pojtinger Date: Wed, 3 Jul 2024 14:26:42 -0700 Subject: [PATCH 2/4] docs: Mention CLA in contribution information, clean up actions --- .github/workflows/cla.yaml | 35 +++++++++++++++++++---------------- .github/workflows/hydrun.yaml | 4 ++-- .gitignore | 1 - CLA.md | 19 +++++++++++-------- CONTRIBUTING.md | 2 +- README.md | 2 +- 6 files changed, 34 insertions(+), 29 deletions(-) diff --git a/.github/workflows/cla.yaml b/.github/workflows/cla.yaml index 1a122cc..953b7c3 100644 --- a/.github/workflows/cla.yaml +++ b/.github/workflows/cla.yaml @@ -1,28 +1,31 @@ -name: "CLA Assistant" +name: CLA Assistant + on: issue_comment: - types: [created] + types: + - created pull_request_target: - types: [opened,closed,synchronize] - -# explicitly configure permissions, in case your GITHUB_TOKEN workflow permissions are set to read-only in repository settings -permissions: - actions: write - contents: write # this can be 'read' if the signatures are in remote repository - pull-requests: write - statuses: write + types: + - opened + - closed + - synchronize jobs: - CLAAssistant: + add-cla-comment: runs-on: ubuntu-latest + permissions: + actions: write + contents: write + pull-requests: write + statuses: write steps: - - name: "CLA Assistant" + - name: Add CLA Comment if: (github.event.comment.body == 'recheck' || github.event.comment.body == 'I have read the CLA Document and I hereby sign the CLA') || github.event_name == 'pull_request_target' uses: contributor-assistant/github-action@v2.4.0 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - path-to-signatures: '.github/signatures/v1/cla.json' - path-to-document: 'https://github.com/loopholelabs/drafter/blob/master/CLA.md' - branch: 'master' - allowlist: bot* \ No newline at end of file + path-to-signatures: .github/signatures/v1/cla.json + path-to-document: https://github.com/loopholelabs/drafter/blob/master/CLA.md + branch: master + allowlist: bot* diff --git a/.github/workflows/hydrun.yaml b/.github/workflows/hydrun.yaml index c7ff2c2..931806d 100644 --- a/.github/workflows/hydrun.yaml +++ b/.github/workflows/hydrun.yaml @@ -3,10 +3,10 @@ name: hydrun CI on: push: paths: - - '!.github/signatures/**' + - !.github/signatures/** pull_request: paths: - - '!.github/signatures/**' + - !.github/signatures/** schedule: - cron: "0 0 * * 0" diff --git a/.gitignore b/.gitignore index ac54bf9..1fcb152 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1 @@ out -.idea \ No newline at end of file diff --git a/CLA.md b/CLA.md index 0de7008..d3ef4de 100644 --- a/CLA.md +++ b/CLA.md @@ -1,4 +1,5 @@ # Contributor License Agreement + In order to clarify the intellectual property license granted with Contributions from any person or entity, Loophole Labs, Inc. (“Loophole”) must have a Contributor License Agreement (“CLA”) on file that has been signed by each Contributor, indicating agreement to the license terms below. This license is for your protection as a Contributor as well as the protection of Loophole; it does not change your rights to use your own Contributions for any other purpose. You accept and agree to the following terms and conditions for Your present and future Contributions submitted to Loophole. Except for the license granted herein to Loophole and recipients of software distributed by Loophole, You reserve all right, title, and interest in and to Your Contributions. If you have any questions about these terms, please contact us at admin@loopholelabs.io. @@ -6,19 +7,21 @@ If you have any questions about these terms, please contact us at admin@loophole Please read this document carefully before signing and keep a copy for your records. ## Definitions + “You” (or “Your”) shall mean the copyright owner or legal entity authorized by the copyright owner that is making this Agreement with Loophole. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, “control” means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity. -1. “Contribution” shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Loophole for inclusion in, or documentation of, any of the products owned or managed by Loophole (the “Work”). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Loophole or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Loophole for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." -2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to Loophole and to recipients of software distributed by Loophole a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. +1. “Contribution” shall mean any original work of authorship, including any modifications or additions to an existing work, that is intentionally submitted by You to Loophole for inclusion in, or documentation of, any of the products owned or managed by Loophole (the “Work”). For the purposes of this definition, "submitted" means any form of electronic, verbal, or written communication sent to Loophole or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, Loophole for the purpose of discussing and improving the Work, but excluding communication that is conspicuously marked or otherwise designated in writing by You as "Not a Contribution." + +2. Grant of Copyright License. Subject to the terms and conditions of this Agreement, You hereby grant to Loophole and to recipients of software distributed by Loophole a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable copyright license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, and distribute Your Contributions and such derivative works. -3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to Loophole and to recipients of software distributed by Loophole a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed. +3. Grant of Patent License. Subject to the terms and conditions of this Agreement, You hereby grant to Loophole and to recipients of software distributed by Loophole a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license to make, have made, use, offer to sell, sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by You that are necessarily infringed by Your Contribution(s) alone or by combination of Your Contribution(s) with the Work to which such Contribution(s) was submitted. If any entity institutes patent litigation against You or any other entity (including a cross-claim or counterclaim in a lawsuit) alleging that your Contribution, or the Work to which you have contributed, constitutes direct or contributory patent infringement, then any patent licenses granted to that entity under this Agreement for that Contribution or Work shall terminate as of the date such litigation is filed. -4. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to Loophole, or that your employer has executed a separate Corporate CLA with Loophole. +4. You represent that you are legally entitled to grant the above license. If your employer(s) has rights to intellectual property that you create that includes your Contributions, you represent that you have received permission to make Contributions on behalf of that employer, that your employer has waived such rights for your Contributions to Loophole, or that your employer has executed a separate Corporate CLA with Loophole. -5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions. +5. You represent that each of Your Contributions is Your original creation (see section 7 for submissions on behalf of others). You represent that Your Contribution submissions include complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which you are personally aware and which are associated with any part of Your Contributions. -6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. +6. You are not expected to provide support for Your Contributions, except to the extent You desire to provide support. You may provide support for free, for a fee, or not at all. Unless required by applicable law or agreed to in writing, You provide Your Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied, including, without limitation, any warranties or conditions of TITLE, NON- INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. -7. Should You wish to submit work that is not Your original creation, You may submit it to Loophole separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]". +7. Should You wish to submit work that is not Your original creation, You may submit it to Loophole separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which you are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]". -8. You agree to notify Loophole of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect. \ No newline at end of file +8. You agree to notify Loophole of any facts or circumstances of which you become aware that would make these representations inaccurate in any respect. diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7d7d5bf..af07844 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -28,4 +28,4 @@ Drafter uses GitHub to manage reviews of pull requests. Practices for Production Environments](http://peter.bourgon.org/go-in-production/#formatting-and-style). -- Be sure to sign off on the [DCO](https://github.com/probot/dco#how-it-works) +- Be sure to sign off on the [CLA](./CLA.md). Once you submit your pull request, [CLA Assistant](https://github.com/contributor-assistant/github-action) will ask you sign off before your pull request can be merged. diff --git a/README.md b/README.md index 210a995..755b188 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ ## Overview -Drafter is a compute primitive designed to support live migration. +Drafter is a compute primitive with live migration support. It enables you to: From 8dc8a29646a365c5242f89460254f43fc71a9b50 Mon Sep 17 00:00:00 2001 From: Felicitas Pojtinger Date: Wed, 3 Jul 2024 14:28:10 -0700 Subject: [PATCH 3/4] chore: Format Dependabot configuration properly --- .github/dependabot.yml | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index cd88554..9aa5f33 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,11 +1,6 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file - version: 2 updates: - - package-ecosystem: "gomod" # See documentation for possible values - directory: "/" # Location of package manifests + - package-ecosystem: gomod + directory: / schedule: - interval: "weekly" + interval: weekly From 80c3e81e2f80e962ade23b30bfae257d6d9c34fc Mon Sep 17 00:00:00 2001 From: Shivansh Vij Date: Wed, 3 Jul 2024 14:28:38 -0700 Subject: [PATCH 4/4] Updating Hydrun CI to ignore `.github` changes --- .github/workflows/hydrun.yaml | 8 ++++---- .gitignore | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/hydrun.yaml b/.github/workflows/hydrun.yaml index 931806d..d3bcc86 100644 --- a/.github/workflows/hydrun.yaml +++ b/.github/workflows/hydrun.yaml @@ -2,11 +2,11 @@ name: hydrun CI on: push: - paths: - - !.github/signatures/** + paths-ignore: + - '.github/signatures/**' pull_request: - paths: - - !.github/signatures/** + paths-ignore: + - '.github/signatures/**' schedule: - cron: "0 0 * * 0" diff --git a/.gitignore b/.gitignore index 1fcb152..ac54bf9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ out +.idea \ No newline at end of file