Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Monorepo import boilerplate #11

Merged
merged 70 commits into from
Aug 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
37ee721
initial commit
jonathanburns Aug 5, 2019
7de4ce2
update dockerfile (#1)
jonathanburns Aug 15, 2019
d8af7c7
removing old flyteadmin comment from golang_dockerfile (#2)
jonathanburns Aug 20, 2019
e8b32ea
Gomod Updates (#4)
wild-endeavor Jan 23, 2020
e7e0a56
Bump go template version to 1.13 (#6)
wild-endeavor Jan 24, 2020
64aa981
use updated versions (#7)
wild-endeavor Jan 24, 2020
3c9e056
PR template for all Flyte repos (#8)
Mar 7, 2020
5e5b30a
separate commands (#9)
honnix Mar 17, 2020
0536f3f
Add target to publish code coverage to codecov.io (#10)
katrogan Apr 13, 2020
a28a384
Add github_actions boilerplate (#11)
EngHabu Apr 27, 2020
752c466
Fixing uniqueness issue with package names in github workflows (#12)
schottra May 8, 2020
852463e
Welcome Bot Message (#15)
samhita-alla Apr 21, 2021
f746465
Allow comments, etc. in update.cfg (#17)
2uasimojo Apr 21, 2021
b3b8bf8
Update Boilerplate (#16)
samhita-alla Apr 22, 2021
8112232
Welcome bot (#18)
samhita-alla Apr 23, 2021
2fa9fbf
shellcheck (#19)
wild-endeavor Apr 30, 2021
551c731
git clone convert from ssh to https (#21)
yindia May 18, 2021
5513459
Moved boilerplate from flyte to lyft (#22)
yindia May 21, 2021
35c0e0e
Added end2end resource for boilerplate (#23)
yindia May 22, 2021
3534c0b
Added small fix in boilerplate (#24)
yindia May 27, 2021
9d470ab
Moved welcome bot config into a specific dir (#25)
yindia May 28, 2021
d0fd13c
Fix welcome bot path (#26)
yindia May 28, 2021
b1cc60a
Added workflow for updating boilerplate code (#20)
yindia May 31, 2021
d79e4dc
hotfix syntax in e2e makefile (#28)
yindia Jun 1, 2021
a5a04fc
Added protoc-gen-doc dependency for IDL doc generation (#27)
pmahindrakar-oss Jun 1, 2021
599a8f1
Added the missing tool (#29)
pmahindrakar-oss Jun 4, 2021
67d8e64
Added precommit (#30)
yindia Jun 17, 2021
2306d2e
Added makefile for precommit (#32)
yindia Jun 17, 2021
c239209
Update PR Template to automatically close issues when merged (#33)
EngHabu Jun 28, 2021
ef2be34
excluded boilerplate dir from goimport (#34)
yindia Jul 10, 2021
58ff480
Add code of conduct (#35)
samhita-alla Jul 19, 2021
709fb10
update perms of code_of_conduct update.sh (#36)
samhita-alla Jul 19, 2021
af7f6dc
Welcome bot update (#37)
samhita-alla Aug 13, 2021
bdca361
Adding grpc_health_probe (#39)
veggiemonk Sep 15, 2021
55fb8fc
Fix boilerplate (#40)
EngHabu Oct 11, 2021
1ff856b
bump versions (#43)
wild-endeavor Nov 1, 2021
a5cf1e1
Welcome bot update (yet again) (#38)
samhita-alla Nov 2, 2021
8c18c87
Fix bash condition in endtoend script (#44)
EngHabu Nov 12, 2021
6d87b93
Removed kustomize steps from script in end2end (#45)
yindia Nov 23, 2021
c39ebfd
Added generate command in boilerplate (#46)
yindia Dec 3, 2021
cd4838e
Update flytestdlib version in golang support tool (#47)
yindia Dec 6, 2021
5dedb5b
revert go version in support tools (#49)
yindia Dec 28, 2021
7e69e81
Add StaleBot yaml config (#50)
EngHabu Jan 20, 2022
d44c76c
Added end2end test script script (#52)
yindia Feb 17, 2022
75a7900
Getting the latest golangcli-lint (#53)
pmahindrakar-oss Feb 24, 2022
8d7b1a5
Use click to define parameters to functional tests script and extra f…
eapolinario Mar 3, 2022
c710b61
Parametrize functional test (#55)
eapolinario Mar 3, 2022
dba9081
Using latest version of pflags (#56)
pmahindrakar-oss Mar 4, 2022
5b3e731
Fix broken go install for pflags because of replace directives (#57)
pmahindrakar-oss Mar 25, 2022
5a165b7
Update flytestdlib to 0.4.17 (#58)
EngHabu Mar 29, 2022
9976fc2
update constructor (#59)
wild-endeavor Mar 30, 2022
1aba53d
Replace vektra/mockery with EngHabu/mockery fork
EngHabu Apr 8, 2022
e3d50c0
Rename is_complete to is_done (#60)
eapolinario Apr 12, 2022
22b3a76
Comment out old name for folders workflow (#61)
eapolinario Apr 12, 2022
bd2d3d4
Update incorrect URL (#62)
supreeth7 Apr 16, 2022
45efa22
feat: change boilerplate workflow name (#63)
yindia Apr 27, 2022
52e1bcf
Bring changes to functional tests from genesis-device (#64)
eapolinario May 27, 2022
d806a30
flytekit config migration (#65)
yindia Jun 1, 2022
fc8b08f
added flyte repo sync (#66)
yindia Jul 18, 2022
1b1e6e1
remove welcome bot (#48)
samhita-alla Jul 22, 2022
96725ce
Address changes needed in boilerplate e2e to facilitate ephemeral/fun…
brucearctor Jul 22, 2022
1603bd3
update workflow name (#68)
pingsutw Aug 11, 2022
f49e451
lite version of the functional test for quick testing (#70)
yindia Sep 12, 2022
9aef1f7
Enable a decks test (#71)
eapolinario Sep 19, 2022
8004373
Comment out the chain_workflows example in the functional tests scrip…
eapolinario Sep 23, 2022
7165ec2
Update functional tests to reflect the new names (#79)
eapolinario Jul 1, 2023
ba4fdd2
Fix name of non-P0 tests (#80)
eapolinario Jul 26, 2023
39e44a3
bumped to golang 1.19 (#81)
hamersaw Aug 4, 2023
9d4a9f2
Merge remote-tracking branch 'monorepo-boilerplate/prepare-monorepo' …
eapolinario Aug 21, 2023
50f0a68
Import boilerplate
eapolinario Aug 21, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions boilerplate-repo/.github/workflows/master.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Propagate boilerplate changes

on:
workflow_dispatch:
push:
branches:
- master

jobs:
deploy:
runs-on: ubuntu-latest
strategy:
matrix:
COMPONENT: [flyteadmin, flytepropeller, flyteconsole, flytecopilot, flyteplugins, datacatalog, flytectl, flytestdlib, flytesnacks, flytekit, flyteidl, flyte]
fail-fast: false
steps:
- uses: actions/checkout@v2
- name: Update boilerplate
run: |
WORKFLOW_ID=$(curl -sS https://api.github.com/repos/flyteorg/${{matrix.COMPONENT}}/actions/workflows | jq '.workflows[] | select(.path == ".github/workflows/upgrade_automation.yml") | {id}' | jq .id)
curl -X POST -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/flyteorg/${{matrix.COMPONENT}}/actions/workflows/$WORKFLOW_ID/dispatches -H "Authorization: token ${{ secrets.FLYTE_BOT_PAT }}" -d '{"ref":"master"}'
shell: bash
4 changes: 4 additions & 0 deletions boilerplate-repo/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.idea/
*.swp
.DS_Store
.vscode/
3 changes: 3 additions & 0 deletions boilerplate-repo/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
This project is governed by [flyteorg's code of
conduct](https://lfprojects.org/policies/code-of-conduct/). All contributors
and participants agree to abide by its terms.
202 changes: 202 additions & 0 deletions boilerplate-repo/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,202 @@

Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. 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.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor 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, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You 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 the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You 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 such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its 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. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "{}"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright 2019 Lyft, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
4 changes: 4 additions & 0 deletions boilerplate-repo/NOTICE
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
boilerplate
Copyright 2021 flyteorg Inc.

This product includes software developed at flyteorg Inc.
101 changes: 101 additions & 0 deletions boilerplate-repo/Readme.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
===========
Boilerplate
===========

Overview
--------

Service oriented architectures are composed of multiple isolated components that share cross-cutting concerns (CI, Logging, Image Builds, etc). Settling on uniform conventions for these concerns can help streamline the development process. As a system evolves, so too do these conventions. Updating boilerplate often requires manual copy/paste of boilerplate files across many repos.

``Boilerplate`` acts as a source-of-truth for boilerplate code. Using a config file, a service developer specifies which conventions they want for their service. The boilerplate tool reads this config, and copies the appropriate boilerplate files into the service repository.

Why clone files?
----------------

Another common method for sharing scripts across repositories is to keep them in one place and run the scripts remotely when needed.

While cloning them into the destination repository takes more space, there are a few advantages.

1. Some files like ``.travis.yml`` _must_ exist inside the target repository. Running that remotely is not an option.

2. Calling remote scripts is less secure.

3. Remote scripts adds a dependency on remote services. Copying the files allows users to work offline.

4. Since all boilerplate files are checked into source code, you can easily view updates to the boilerplate files using your version control system.

Adding boilerplate to a repository
----------------------------------

1. Add ``export REPOSITORY=<YOUR_REPO_NAME>`` at the top of the ``Makefile`` in your repository (create a ``Makefile``, if needed)

2. Add the following to your ``Makefile``

::

.PHONY: update_boilerplate
update_boilerplate:
@boilerplate/update.sh

3. Copy the `<https://github.com/flyteorg/boilerplate/blob/master/boilerplate/update.sh>`_ script and paste it to ``boilerplate/update.sh`` of your repository. Make it executable with ``chmod +x boilerplate/update.sh``

4. Add a file ``boilerplate/update.cfg`` and configure it with the options below.

5. Execute ``make update_boilerplate`` in the root of your repository to sync the boilerplate.

6. Execute ``make update_boilerplate`` periodically to pull in the latest boilerplate.


Configuration
-------------

Boilerplate files are organized into "conventions". Different services require different conventions. For example, python services might require a python Dockerfile, while golang services need a golang Dockerfile. The boilerplate config allows you to opt into only the conventions that suit your needs.

To opt into a convention, configure ``boilerplate/update.cfg`` with the conventions that you'd like to opt in to. The convention files live in `<https://github.com/flyteorg/boilerplate/tree/master/boilerplate>`_ and are specified in the format ``{namespace}/{convention}``

For example, to opt-into flyteorg's ``docker_build`` and ``golangci_file`` conventions, your ``boilerplate/update.cfg`` file might look like this:

::

# Use standard docker build targets
flyteorg/docker_build

# Common linting configuration for golang
flyteorg/golangci_file

below is a full list of available conventions.

`flyteorg/docker_build <https://github.com/flyteorg/boilerplate/blob/master/boilerplate/flyte/docker_build/Readme.rst>`_

`flyteorg/golang_dockerfile <https://github.com/flyteorg/boilerplate/blob/master/boilerplate/flyte/golang_dockerfile/Readme.rst>`_

`flyteorg/golangci_file <https://github.com/flyteorg/boilerplate/blob/master/boilerplate/flyte/golangci_file/Readme.rst>`_

`flyteorg/golang_test_targets <https://github.com/flyteorg/boilerplate/blob/master/boilerplate/flyte/golang_dockerfile/Readme.rst>`_

`flyteorg/pull_request_template <https://github.com/flyteorg/boilerplate/blob/master/boilerplate/flyte/golang_test_targets/Readme.rst>`_

`flyteorg/flyte_golang_compile <https://github.com/flyteorg/boilerplate/blob/master/boilerplate/flyte/flyte_golang_compile/Readme.rst>`_

*Note*: some conventions require some minor configurations, the Readme of the convention should inform you of anything else you need to do.


Developing boilerplate
----------------------

Boilerplate conventions live in the `boilerplate <https://github.com/flyteorg/boilerplate/tree/master/boilerplate>`_ directory, and come in the format ``{{ namespace }}/{{ convention }}``. This directory should contain all boilerplate files, along with two special files.

Readme.rst
**********

Every boilerplate convention should come with a ``Readme.rst`` that explains:

1. All functionality provided by the boilerplate files.
2. How to use the the boilerplate.

All boilerplate changes should update the Readme.rst to explain the changes. This ensures that a developer syncing boilerplate updates will understand the changes.

Update.sh
*********

Some boilerplate files require small changes beyond the default file cloning. For example, the ``travis.yml`` file needs to exist in the root of your repo (not in the ``boilerplate`` directory where it's cloned by default). After cloning, the ``update.sh`` script for the convention will run. The convention developer can use that script to copy the ``.travis.yml`` file from the boilerplate directory into the root of the repository.
Empty file added boilerplate-repo/c.sh
Empty file.
12 changes: 12 additions & 0 deletions boilerplate/flyte/docker_build/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# WARNING: THIS FILE IS MANAGED IN THE 'BOILERPLATE' REPO AND COPIED TO OTHER REPOSITORIES.
# ONLY EDIT THIS FILE FROM WITHIN THE 'FLYTEORG/BOILERPLATE' REPOSITORY:
#
# TO OPT OUT OF UPDATES, SEE https://github.com/flyteorg/boilerplate/blob/master/Readme.rst

.PHONY: docker_build
docker_build:
IMAGE_NAME=$$REPOSITORY ./boilerplate/flyte/docker_build/docker_build.sh

.PHONY: dockerhub_push
dockerhub_push:
IMAGE_NAME=flyteorg/$$REPOSITORY REGISTRY=docker.io ./boilerplate/flyte/docker_build/docker_build.sh
23 changes: 23 additions & 0 deletions boilerplate/flyte/docker_build/Readme.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
Docker Build and Push
~~~~~~~~~~~~~~~~~~~~~

Provides a ``make docker_build`` target that builds your image locally.

Provides a ``make dockerhub_push`` target that pushes your final image to Dockerhub.

The Dockerhub image will tagged ``<REPOSITORY>:<GIT COMMIT SHA>``

If git head has a git tag, the Dockerhub image will also be tagged ``<IMAGE>:<GIT_TAG>``.

**To Enable:**

Add ``flyteorg/docker_build`` to your ``boilerplate/update.cfg`` file.

Add ``include boilerplate/flyte/docker_build/Makefile`` in your main ``Makefile`` _after_ your REPOSITORY environment variable

::

REPOSITORY=<myreponame>
include boilerplate/flyte/docker_build/Makefile

(this ensures the extra Make targets get included in your main Makefile)
Loading
Loading