Skip to content

Commit

Permalink
Merge pull request #6 from jedipunkz/feature/add-ci-workflow
Browse files Browse the repository at this point in the history
Feature/add ci workflow
  • Loading branch information
jedipunkz committed Jan 13, 2023
2 parents 19091b3 + 069e955 commit 3fc2b1a
Show file tree
Hide file tree
Showing 5 changed files with 130 additions and 6 deletions.
55 changes: 55 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
name: Go-CI

on: [push]

jobs:
setup:
runs-on: ubuntu-latest
steps:
- name: Set Up
uses: actions/setup-go@v3
with:
go-version: ^1.19
id: go

- name: Check Out
uses: actions/checkout@v3.2.0

- name: Cache
uses: actions/cache@v3.0.11
with:
path: ~/go/pkg/mod
key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
restore-keys: |
${{ runner.os }}-go-
build:
needs: setup
runs-on: ubuntu-latest
steps:
- name: Check Out
uses: actions/checkout@v3.2.0

- name: Build
run: go build ./...

test:
needs: setup
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v3.2.0

- name: Test
run: go test ./... -v

lint:
needs: setup
runs-on: ubuntu-latest
steps:
- name: Check Out
uses: actions/checkout@v3.2.0

- name: Golangci-Lint
uses: golangci/golangci-lint-action@v3
with:
version: latest
70 changes: 70 additions & 0 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# For most projects, this workflow file will not need changing; you simply need
# to commit it to your repository.
#
# You may wish to alter this file to override the set of languages analyzed,
# or to provide custom queries or build logic.
#
# ******** NOTE ********
# We have attempted to detect the languages in your repository. Please check
# the `language` matrix defined below to confirm you have the correct set of
# supported CodeQL languages.
#
name: "CodeQL"

on:
push:
branches: [ main ]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
schedule:
- cron: '0 15 * * *'

jobs:
analyze:
name: Analyze
runs-on: ubuntu-latest
permissions:
actions: read
contents: read
security-events: write

strategy:
fail-fast: false
matrix:
language: [ 'go' ]
# CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
# Learn more about CodeQL language support at https://git.io/codeql-language-support

steps:
- name: Checkout repository
uses: actions/checkout@v3.2.0

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
# By default, queries listed here will override any specified in a config file.
# Prefix the list here with "+" to use these queries and those in the config file.
# queries: ./path/to/local/query, your-org/your-repo/queries@main

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# ESP - ECS Stats Plotter

![Go-CI](https://github.com/jedipunkz/esp/workflows/Go-CI/badge.svg)
![CodeQL](https://github.com/jedipunkz/esp/workflows/CodeQL/badge.svg)

## Description

ESP Retrives AWS ECS Container Stats from Metadata Endpoint and Plots Stats to Cloudwatch high-resolution Custom Metrics.
Expand Down
4 changes: 2 additions & 2 deletions ecs/ecsmetadata.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"encoding/json"
"fmt"
"io/ioutil"
"io"
"net/http"
"net/url"
"os"
Expand Down Expand Up @@ -110,7 +110,7 @@ func (c *Client) request(ctx context.Context, uri string, out interface{}) error
}
defer resp.Body.Close()

body, err := ioutil.ReadAll(resp.Body)
body, err := io.ReadAll(resp.Body)
if err != nil {
return err
}
Expand Down
4 changes: 0 additions & 4 deletions esp.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,6 @@ func main() {
for _, container := range taskMetadata.Containers {
if container.Name == containerName {
s := containersMetadata[container.DockerID]
if &s == nil {
log.Printf("Could not find stats for container %s", container.DockerID)
continue
}

cpuUsage := ((float64(s.CPUStats.CPUUsage.TotalUsage) - float64(s.PreCPUStats.CPUUsage.TotalUsage)) /
(float64(s.CPUStats.SystemCPUUsage) - float64(s.PreCPUStats.SystemCPUUsage))) *
Expand Down

0 comments on commit 3fc2b1a

Please sign in to comment.