Skip to content

Commit

Permalink
Merge branch 'master' into exclude-update
Browse files Browse the repository at this point in the history
  • Loading branch information
ordovicia authored Aug 31, 2023
2 parents 584c3dd + be1bc25 commit 49ba2d4
Show file tree
Hide file tree
Showing 6 changed files with 208 additions and 40 deletions.
34 changes: 34 additions & 0 deletions .github/workflows/scripts.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
name: scripts
on:
pull_request:
branches:
- master
paths:
- ".github/workflows/scripts.yaml"
- "scripts/**"
permissions:
contents: read

concurrency:
group: '$${{ github.workflow }}-$${{ github.head_ref || github.ref }}'
cancel-in-progress: true

jobs:
golangci:
name: lint
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
folder: [artifacthub, require-sync, validate, website]
steps:
- uses: actions/setup-go@4d34df0c2316fe8122ab82dc22947d607c0c91f9 # v4.0.0
with:
go-version: '1.20'
cache: false
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab # v3.5.2
- name: golangci-lint
uses: golangci/golangci-lint-action@08e2f20817b15149a52b5b3ebe7de50aff2ba8c5 # v3.4.0
with:
version: v1.54.2
working-directory: scripts/${{ matrix.folder }}
50 changes: 50 additions & 0 deletions .golangci.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
run:
timeout: 5m

linters-settings:
gocritic:
enabled-tags:
- performance
gosec:
excludes:
- G108
importas:
no-unaliased: true
alias:
- pkg: "github.com/open-policy-agent/frameworks/constraint/pkg/client"
alias: constraintclient
lll:
line-length: 200

misspell:
locale: US
staticcheck:
# Select the Go version to target. The default is '1.13'.
go: "1.20"

linters:
disable-all: true
enable:
- errcheck
- errorlint
- exportloopref
- forcetypeassert
- gci
- gocritic
- goconst
- godot
- gofmt
- gofumpt
- goimports
- gosec
- gosimple
- govet
- importas
- ineffassign
- misspell
- revive # replacement for golint
- staticcheck
- typecheck
- unconvert
- unused
- whitespace
73 changes: 58 additions & 15 deletions scripts/artifacthub/hub.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,17 +83,17 @@ type DefaultClient struct{}

// Get is a method of DefaultClient that makes the actual HTTP GET request.
func (c DefaultClient) Get(url string) (*http.Response, error) {
return http.Get(url)
return http.Get(url) //nolint
}

const (
// entryPoint is the directory entry point for artifact hub
// entryPoint is the directory entry point for artifact hub.
ahEntryPoint = "artifacthub"

// directory entry point for library
// directory entry point for library.
entryPoint = "library"

// raw github source URL
// raw github source URL.
sourceURL = "https://raw.githubusercontent.com/open-policy-agent/gatekeeper-library/master/"
)

Expand Down Expand Up @@ -151,7 +151,7 @@ func main() {
}

func createVersionDirectory(rootDir, basePath, githubSourceRelativePath string, constraintTemplate map[string]interface{}) {
version := fmt.Sprintf("%s", constraintTemplate["metadata"].(map[string]interface{})["annotations"].(map[string]interface{})["metadata.gatekeeper.sh/version"])
version := getConstraintTemplateVersion(constraintTemplate)

// create directory if not exists
destination := filepath.Join(rootDir, ahEntryPoint, basePath, version)
Expand Down Expand Up @@ -192,11 +192,11 @@ func addArtifactHubMetadata(sourceDirectory, destinationPath, ahBasePath, github
}

artifactHubMetadata = &ArtifactHubMetadata{
Version: fmt.Sprintf("%s", constraintTemplate["metadata"].(map[string]interface{})["annotations"].(map[string]interface{})["metadata.gatekeeper.sh/version"]),
Name: fmt.Sprintf("%s", constraintTemplate["metadata"].(map[string]interface{})["name"]),
DisplayName: fmt.Sprintf("%s", constraintTemplate["metadata"].(map[string]interface{})["annotations"].(map[string]interface{})["metadata.gatekeeper.sh/title"]),
Version: getConstraintTemplateVersion(constraintTemplate),
Name: getConstraintTemplateName(constraintTemplate),
DisplayName: getConstraintTemplateTitle(constraintTemplate),
CreatedAt: currentDateTime.Format(time.RFC3339),
Description: fmt.Sprintf("%s", constraintTemplate["metadata"].(map[string]interface{})["annotations"].(map[string]interface{})["description"]),
Description: getConstraintTemplateDescription(constraintTemplate),
License: "Apache-2.0",
HomeURL: "https://open-policy-agent.github.io/gatekeeper-library/website/" + sourceDirectory,
Keywords: []string{
Expand All @@ -211,7 +211,7 @@ func addArtifactHubMetadata(sourceDirectory, destinationPath, ahBasePath, github
},
Install: fmt.Sprintf("### Usage\n```shell\nkubectl apply -f %s\n```", sourceURL+filepath.Join(ahBasePath, "template.yaml")),
Readme: fmt.Sprintf(`# %s
%s`, constraintTemplate["metadata"].(map[string]interface{})["annotations"].(map[string]interface{})["metadata.gatekeeper.sh/title"], constraintTemplate["metadata"].(map[string]interface{})["annotations"].(map[string]interface{})["description"]),
%s`, getConstraintTemplateTitle(constraintTemplate), getConstraintTemplateDescription(constraintTemplate)),
}
} else {
// when metadata file already exists, check version to make sure it's updated if constraint template is changed
Expand All @@ -230,7 +230,7 @@ func addArtifactHubMetadata(sourceDirectory, destinationPath, ahBasePath, github
panic(err)
}

err = os.WriteFile(filepath.Join(destinationPath, "artifacthub-pkg.yml"), artifactHubMetadataBytes, 0644)
err = os.WriteFile(filepath.Join(destinationPath, "artifacthub-pkg.yml"), artifactHubMetadataBytes, 0o600)
if err != nil {
fmt.Println("error while writing artifact hub metadata")
panic(err)
Expand All @@ -242,7 +242,7 @@ func checkVersion(httpClient HTTPClient, artifactHubMetadata *ArtifactHubMetadat
githubTemplateURL := sourceURL + githubSourceRelativePath
resp, err := httpClient.Get(githubTemplateURL)
if err != nil {
return fmt.Errorf("error while getting constraint template from github: %v", err)
return fmt.Errorf("error while getting constraint template from github: %w", err)
}
if resp.StatusCode == http.StatusNotFound {
fmt.Printf("constraint template %s not found in github. It is likely that constraint template is being updated locally and not merged to github yet.\n", githubSourceRelativePath)
Expand All @@ -265,7 +265,7 @@ func checkVersion(httpClient HTTPClient, artifactHubMetadata *ArtifactHubMetadat
githubConstraintTemplateHash := getConstraintTemplateHash(githubConstraintTemplate)
if artifactHubMetadata.Digest != githubConstraintTemplateHash {
// compare version
if artifactHubMetadata.Version == githubConstraintTemplate["metadata"].(map[string]interface{})["annotations"].(map[string]interface{})["metadata.gatekeeper.sh/version"].(string) {
if artifactHubMetadata.Version == getConstraintTemplateVersion(githubConstraintTemplate) {
// panic if version is same but hash is different
return fmt.Errorf("looks like template.yaml is updated but the version is not. Please update the 'metadata.gatekeeper.sh/version' annotation in the template.yaml source")
}
Expand Down Expand Up @@ -308,7 +308,7 @@ func getMetadataIfExist(metadataFilePath string) *ArtifactHubMetadata {
return nil
}

// copyDirectory copies a whole directory recursively
// copyDirectory copies a whole directory recursively.
func copyDirectory(src string, dst string) error {
var err error
var directoryFileInfo []fs.DirEntry
Expand Down Expand Up @@ -345,7 +345,7 @@ func copyDirectory(src string, dst string) error {
return nil
}

// copyFile copies a single file from src to dst
// copyFile copies a single file from src to dst.
func copyFile(src, dst string) error {
var err error
var sourceFile *os.File
Expand All @@ -371,3 +371,46 @@ func copyFile(src, dst string) error {
}
return os.Chmod(dst, sourceFileInfo.Mode())
}

func getConstraintTemplateMetadata(constraintTemplate map[string]interface{}) map[string]interface{} {
metadata, ok := constraintTemplate["metadata"].(map[string]interface{})
if !ok {
panic("error while retrieving constraintTemplate metadata")
}
return metadata
}

func getConstraintTemplateAnnotations(constraintTemplate map[string]interface{}) map[string]interface{} {
metadata := getConstraintTemplateMetadata(constraintTemplate)

annotations, ok := metadata["annotations"].(map[string]interface{})
if !ok {
panic("error while retrieving constraintTemplate annotations")
}

return annotations
}

func getConstraintTemplateName(constraintTemplate map[string]interface{}) string {
metadata := getConstraintTemplateMetadata(constraintTemplate)

return fmt.Sprintf("%s", metadata["name"])
}

func getConstraintTemplateVersion(constraintTemplate map[string]interface{}) string {
annotations := getConstraintTemplateAnnotations(constraintTemplate)

return fmt.Sprintf("%s", annotations["metadata.gatekeeper.sh/version"])
}

func getConstraintTemplateTitle(constraintTemplate map[string]interface{}) string {
annotations := getConstraintTemplateAnnotations(constraintTemplate)

return fmt.Sprintf("%s", annotations["metadata.gatekeeper.sh/title"])
}

func getConstraintTemplateDescription(constraintTemplate map[string]interface{}) string {
annotations := getConstraintTemplateAnnotations(constraintTemplate)

return fmt.Sprintf("%s", annotations["description"])
}
13 changes: 7 additions & 6 deletions scripts/artifacthub/hub_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
)

const (
expectedHash = "dc888d5c05f7e0421a47adfe2d4e59b5264d6e56ec0b3392fe9b3d224bd61a3e"
expectedHash = "dc888d5c05f7e0421a47adfe2d4e59b5264d6e56ec0b3392fe9b3d224bd61a3e" //nolint
)

func TestGetConstraintTemplateHash(t *testing.T) {
Expand Down Expand Up @@ -81,7 +81,6 @@ func TestGetConstraintTemplateHash(t *testing.T) {
}

func TestGetMetadataIfExist(t *testing.T) {

testCases := []struct {
name string
metadataFilePath string
Expand Down Expand Up @@ -120,7 +119,9 @@ func TestCopyDirectory(t *testing.T) {

// create a file in the src directory
srcFilePath := srcDirPath + "/test.txt"
os.WriteFile(srcFilePath, []byte("test"), 0o644)
if os.WriteFile(srcFilePath, []byte("test"), 0o600) != nil {
t.Errorf("error writing file")
}

testCases := []struct {
name string
Expand Down Expand Up @@ -172,7 +173,7 @@ type MockClient struct {
}

// Get is a method of MockClient that returns the pre-configured response and error.
func (c MockClient) Get(url string) (*http.Response, error) {
func (c MockClient) Get(_ string) (*http.Response, error) {
return c.Resp, c.Err
}

Expand Down Expand Up @@ -244,7 +245,7 @@ func TestCheckVersion(t *testing.T) {

for _, tc := range testCases {
t.Run(tc.name, func(t *testing.T) {
githubConstraintTemplateBytes, err := yaml.Marshal(tc.githubConstraintTemplate)
githubConstraintTemplateBytes, _ := yaml.Marshal(tc.githubConstraintTemplate)

// Create a mock client with a pre-configured response and error.
mockResp := &http.Response{
Expand All @@ -256,7 +257,7 @@ func TestCheckVersion(t *testing.T) {
Err: tc.httpError,
}

err = checkVersion(mockClient, tc.artifactHubMetadata, "path/to/constraint/template.yaml")
err := checkVersion(mockClient, tc.artifactHubMetadata, "path/to/constraint/template.yaml")

if tc.expectedErrorMessage != "" {
if err == nil {
Expand Down
6 changes: 4 additions & 2 deletions scripts/validate/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,14 +50,16 @@ func TestValidateDocsDirStructure(t *testing.T) {

// Create the directory structure
docsDirPath := filepath.Join(tmpDir, docsDirEntry)
err = os.MkdirAll(docsDirPath, 0755)
err = os.MkdirAll(docsDirPath, 0o755)
if err != nil {
t.Fatalf("Error creating docs dir: %v", err)
}
for _, item := range tc.dirStructure {
path := filepath.Join(docsDirPath, item)
if filepath.Ext(path) == "" {
err = os.Mkdir(path, 0755)
if os.Mkdir(path, 0o755) != nil {
t.Fatalf("Error creating directory: %v", path)
}
} else {
f, err := os.Create(path)
if err != nil {
Expand Down
Loading

0 comments on commit 49ba2d4

Please sign in to comment.