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

Lots of context.Context work #6

Open
wants to merge 30 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
1d42c70
using google context to pass context down to every method
ghstahl Oct 22, 2019
9f27e7f
added context.Context to arbitrary-resource-owner.go
ghstahl Oct 22, 2019
e7a1fe9
more context.Context
ghstahl Oct 22, 2019
e165e79
Merge branch 'master' into master
ghstahl Oct 22, 2019
0f9661a
Merge branch 'master' into master
ghstahl Oct 22, 2019
706ef07
bumpversion
ghstahl Oct 22, 2019
d7bfc69
Bump version: 0.4.0 → 0.5.0
ghstahl Oct 22, 2019
6b86555
need to use alpine or calls to azure keyvault fail
ghstahl Oct 22, 2019
984f4dc
example docker-compose.yml
ghstahl Oct 23, 2019
f5995e4
Adding ctx timeout handling
ghstahl Oct 23, 2019
f520e02
more work around error handling and messaging
ghstahl Oct 23, 2019
d59c1b4
initial cobrafied version of artificer
ghstahl Oct 31, 2019
21386ad
a bit of cleanup
ghstahl Oct 31, 2019
85dd24e
added splash
ghstahl Oct 31, 2019
a9da68f
added healthcheck
ghstahl Nov 1, 2019
b665060
using cron to fire up a run immediate schedule
ghstahl Nov 1, 2019
fad7d31
add timestamp when we are healthy
ghstahl Nov 1, 2019
33ba5a3
trying for 12 hours to get keyvault keys, before we give up.
ghstahl Nov 1, 2019
86b2079
docker build working
ghstahl Nov 6, 2019
c63f7e3
working image
ghstahl Nov 8, 2019
5c3e7e1
Merge branch 'master' of https://github.com/P7CoreOrg/artificer
ghstahl Nov 8, 2019
aa77456
allowing a full config file so docker-compose and k8s can inject a file.
ghstahl Nov 9, 2019
4e0e132
docker-compose.yml with volumes
ghstahl Nov 9, 2019
f05deae
added in some object validation when dealing with cli args
ghstahl Nov 9, 2019
be58513
abstracting away signer. Want a dev only ECDSA one that is local
ghstahl Nov 9, 2019
87ad8f0
playing with ECDSA and JWK
ghstahl Nov 9, 2019
b223fe8
covering
ghstahl Nov 11, 2019
0c9168d
refactoring
ghstahl Nov 11, 2019
20967b1
signing with edcsa
ghstahl Nov 13, 2019
d2db74b
jwt minter
ghstahl Nov 13, 2019
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
2 changes: 1 addition & 1 deletion .bumpversion.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[bumpversion]
current_version = 0.3.0
current_version = 0.5.0
tag = False
commit = True

Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
##
## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore

# Secrets
docker-compose-acr.yml

artificer-cobra/example/serve.json

# User-specific files
*.rsuser
*.suo
Expand Down
30 changes: 29 additions & 1 deletion .vscode/launch.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,34 @@
"program": "${workspaceFolder}/cmd/artificer/main.go",
"env": {},
"args": [""]
}
},
{
"name": "Launch Cobra Artificer",
"type": "go",
"request": "launch",
"mode": "auto",
"program": "${workspaceFolder}/artificer-cobra/main.go",
"env": {},
"args": ["serve","--config-path","foo"]
},
{
"name": "Launch Cobra Artificer 2",
"type": "go",
"request": "launch",
"mode": "auto",
"program": "${workspaceFolder}/artificer-cobra/main.go",
"env": {},
"args": ["serve","--healthcheck-port","9998","--port","9000","--az-group-name","cct-test-resource","--az-subscription-id","39ac48fb-fea0-486a-ba84-e0ae9b06c663","--az-tenant-id","3b217a9b-6c58-428b-b022-5ad741ce2016","--key-vault-client-id","ddecd689-3d6c-4311-b354-45ab6fa7e48c","--key-vault-client-secret","<secret>"]
},
{
"name": "Launch Cobra Artificer ConfigPath",
"type": "go",
"request": "launch",
"mode": "auto",
"program": "${workspaceFolder}/artificer-cobra/main.go",
"env": {},
"args": ["serve","--config-path","example/serve.json" ]
},

]
}
202 changes: 202 additions & 0 deletions artificer-cobra/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 Artificer Authors

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.
9 changes: 9 additions & 0 deletions artificer-cobra/cmd/cli-flags.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package cmd

type cliFlags struct {
LongFlag string
ShortFlag string
Default string
Description string
Required bool
}
18 changes: 18 additions & 0 deletions artificer-cobra/cmd/consts.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package cmd

const (
splashHealthCheck = `

|_| _ _. | _|_ |_ / |_ _ _ |
| | (/_ (_| | |_ | | \_ | | (/_ (_ |< github.com/heptiolabs/healthcheck

`
splash = `
___ __ _ ____
/ _ | ____/ /_(_) _(_)______ ____
/ __ |/ __/ __/ / _/ / __/ -_) __/
/_/ |_/_/ \__/_/_//_/\__/\__/_/

an minimal oauth2 service
`
)
87 changes: 87 additions & 0 deletions artificer-cobra/cmd/root.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
/*
Copyright © 2019 Artificer Authors

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.
*/
package cmd

import (
"fmt"
"os"

"github.com/spf13/cobra"

homedir "github.com/mitchellh/go-homedir"
"github.com/spf13/viper"
)

var cfgFile string

// rootCmd represents the base command when called without any subcommands
var rootCmd = &cobra.Command{
Use: "artificer-cobra",
Short: splash,
Long: splash,
// Uncomment the following line if your bare application
// has an action associated with it:
// Run: func(cmd *cobra.Command, args []string) { },
}

// Execute adds all child commands to the root command and sets flags appropriately.
// This is called by main.main(). It only needs to happen once to the rootCmd.
func Execute() {
if err := rootCmd.Execute(); err != nil {
fmt.Println(err)
os.Exit(1)
}
}

func init() {
cobra.OnInitialize(initConfig)

// Here you will define your flags and configuration settings.
// Cobra supports persistent flags, which, if defined here,
// will be global for your application.

rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "config file (default is $HOME/.artificer-cobra.yaml)")

// Cobra also supports local flags, which will only run
// when this action is called directly.
rootCmd.Flags().BoolP("toggle", "t", false, "Help message for toggle")
}

// initConfig reads in config file and ENV variables if set.
func initConfig() {
if cfgFile != "" {
// Use config file from the flag.
viper.SetConfigFile(cfgFile)
} else {
// Find home directory.
home, err := homedir.Dir()
if err != nil {
fmt.Println(err)
os.Exit(1)
}

// Search config in home directory with name ".artificer-cobra" (without extension).
viper.AddConfigPath(home)
viper.SetConfigName(".artificer-cobra")
}

viper.AutomaticEnv() // read in environment variables that match

// If a config file is found, read it in.
if err := viper.ReadInConfig(); err == nil {
fmt.Println("Using config file:", viper.ConfigFileUsed())
}
}
Loading