ADD packageLookup package and osDiscovery package #9

lobiCode · 2017-05-24T13:26:40Z

-tags flag is not needed any more when we build a code,
because package osDiscovery provide functionality to get all
the basic system information data. According to distribution provided
by osDiscovery, installed packages are fetched with package
packageLookup.

dominikznidar

First batch of comments

dominikznidar · 2017-05-29T15:17:50Z

.travis.yml

-  - VERSION=${TRAVIS_TAG:=$(cat ./VERSION)} make pkg/$DISTRIBUTION
-  - sed -i'' -e "s/\DISTRIBUTION/${DISTRIBUTION}/" descriptor.json
+  - VERSION=${TRAVIS_TAG:=$(cat ./VERSION)} make pkg/$PACKAGE_MANAGER
+  - sed -i'' -e "s/\PACKAGE_MANAGER/${PACKAGE_MANAGER}/" descriptor.json


What does this do?

Set version env to current version and build packages.

replace PACKAGE_MANAGER with package manager from matrix in descriptor.json file.
I forgot to change DISTRIBUTION in descriptor.json file with PACKAGE_MANAGER or maybe I should ask before I changed those lines because I don't know what consequence this will have for deploying process.

dominikznidar · 2017-05-29T15:19:18Z

Makefile

@@ -8,7 +8,8 @@ CI_COMMIT     ?= dev
 GIT_COMMIT    := $(shell git rev-parse --short HEAD || echo $(CI_COMMIT))
 VERSION       ?= $(shell cat ./VERSION)
 FLAGS         := "-X main.GitCommit=$(GIT_COMMIT) -X main.Version=$(VERSION)"
-DISTRIBUTIONS := ubuntu debian rhel centos opensuse sles
+DISTRIBUTIONS := ubuntu debian rhel centos opensuse sles amzn
+PACKAGE_MANAGER := dpkg rpm


all lines above this one are nicely aligned.

dominikznidar · 2017-05-29T15:21:09Z

Makefile

-	@echo "*\n* Testing for $* locally \n*"
-	go test $(TEST_FLAGS) -tags $*
+test: vet 
+	go test -v


you could also just run go test ./...

done. change to go test ./...

dominikznidar · 2017-05-29T15:22:34Z

Makefile


 format: ## formats the code
 	gofmt -w $(SOURCE)

 vet: ## examines the go code with `go vet`
-	go vet $(SOURCE)
+	go vet


this does not find vet issues in subfolders, go vet ./... does.

done. change to go vet ./...

dominikznidar · 2017-05-29T15:24:02Z

Makefile


 format: ## formats the code
 	gofmt -w $(SOURCE)

 vet: ## examines the go code with `go vet`
-	go vet $(SOURCE)
+	go vet

 up: $(addprefix up/,$(DISTRIBUTIONS)) ## start agents for all distributions
 up/%: ## starts the agent for a specific distribution
 	docker-compose --project-name=tactycal up agent$*

 run/%:


you made /% obsolete

fixed. /% has been removed. docker-compose.ym and docker-compose.tmpl files have been also updated.

dominikznidar · 2017-05-30T08:29:20Z

.travis.yml

-  - DISTRIBUTION=rhel
-  - DISTRIBUTION=opensuse
-  - DISTRIBUTION=sles
+  - PACKAGE_MANAGER=dpkg


can you change this from dpkg / rpm to deb / rpm as those will be the names of repositories in bintray.com. You can then also replace PACKAGE_MANAGER with PACKAGE_TYPE.

Done.

PACKAGE_MANAGER has been replaced with PACKAGE_TYPE

dpkg has been replaced with deb

dominikznidar · 2017-05-30T08:38:47Z

Makefile

-test/%: vet ## runs unit tests for a specific distribution
-	@echo "*\n* Testing for $* locally \n*"
-	go test $(TEST_FLAGS) -tags $*
+test: vet 


The comment that adds the method to the help screen (make help) is missing. Can you add it?

Fixed. Comment has been added.

dominikznidar · 2017-05-30T09:16:50Z

Makefile


 format: ## formats the code
 	gofmt -w $(SOURCE)

 vet: ## examines the go code with `go vet`
-	go vet $(SOURCE)
+	go vet ./...

 up: $(addprefix up/,$(DISTRIBUTIONS)) ## start agents for all distributions
 up/%: ## starts the agent for a specific distribution


Can you also do a slight change here? If you change up/%: to up/%: build we can also stop building custom images for all the repos, just mount build folder to them in docker-compose and execute the binary in them.
In short, can you change this so that we run the generated binary inside docker containers and not run the source code with go installed.

dominikznidar · 2017-05-30T09:25:39Z

host.go

-	if release, err := execCommand("lsb_release", "-r"); err == nil {
-		return string(release)
-	}
+func GetHostInfo() (*Host, error) {


Please add a test for this.

dominikznidar · 2017-05-30T09:27:24Z

packageLookup/stubUtils.go

@@ -0,0 +1,234 @@
+package packageLookup


Can you put this in a separate folder?

stubUtils package has been added.

dominikznidar · 2017-06-01T11:49:01Z

docker-compose.tmpl

@@ -4,7 +4,8 @@ services:
    build:
      context: ./
      dockerfile: Dockerfile.debian
-    working_dir: /go/src/agent
+    working_dir: /go/src/github.com/tactycal/agent
+    command: ./build/usr/bin/tactycal -f my_conf.conf -s /state/agnet_state -t 3s -d


agent -> agent

fixed in my commit

`-tags` flag is not needed any more when we build a code, because package **osDiscovery** provide functionality to get all the basic system information data. According to distribution provided by **osDiscovery**, installed packages are fetched with package **packageLookup**.

Also removes the docker-compose template as we were not saving any space with it.

lobiCode force-pushed the add-sub-pacakges branch 2 times, most recently from 4763c6e to e32915f Compare May 25, 2017 13:01

dominikznidar suggested changes May 29, 2017

View reviewed changes

dominikznidar suggested changes May 30, 2017

View reviewed changes

lobiCode force-pushed the add-sub-pacakges branch 2 times, most recently from db83c88 to 75fb4b7 Compare June 1, 2017 10:58

dominikznidar approved these changes Jun 4, 2017

View reviewed changes

dominikznidar force-pushed the add-sub-pacakges branch 2 times, most recently from 3b87872 to 13d50c7 Compare June 15, 2017 11:47

Uros Slana and others added 11 commits June 15, 2017 13:56

ADD full import path for osDiscovery and packageLookup pacakges

5240ec4

FIX aligned issue

400b189

UPD command go test and go vet for make test target

464f9ff

FIX remove % at make run target

5c0bb3a

UPD version to 0.8.0

6b65dc7

UPD replace PACKAGE_MANAGER with PACKAGE_TYPE

4867eb2

FIX add comment to test target

68510c1

ADD build target to up/% in make file

18b99fd

ADD stubUtils pacakge

32061d2

REM obsolete dockerfiles

8840218

Also removes the docker-compose template as we were not saving any space with it.

dominikznidar force-pushed the add-sub-pacakges branch from 13d50c7 to 8840218 Compare June 15, 2017 11:57

dominikznidar merged commit 8840218 into master Jun 15, 2017

dominikznidar deleted the add-sub-pacakges branch June 15, 2017 12:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

ADD packageLookup package and osDiscovery package #9

ADD packageLookup package and osDiscovery package #9

lobiCode commented May 24, 2017

dominikznidar left a comment

dominikznidar May 29, 2017

lobiCode May 30, 2017

dominikznidar May 29, 2017

lobiCode May 30, 2017

dominikznidar May 29, 2017

lobiCode May 30, 2017

dominikznidar May 29, 2017

lobiCode May 30, 2017

dominikznidar May 29, 2017

lobiCode May 30, 2017 •

edited

Loading

dominikznidar May 30, 2017

lobiCode May 31, 2017

dominikznidar May 30, 2017

lobiCode May 31, 2017

dominikznidar May 30, 2017

lobiCode May 31, 2017

dominikznidar May 30, 2017

lobiCode Jun 1, 2017

dominikznidar May 30, 2017

lobiCode Jun 1, 2017

dominikznidar Jun 1, 2017

dominikznidar Jun 1, 2017

dominikznidar Jun 4, 2017

ADD packageLookup package and osDiscovery package #9

ADD packageLookup package and osDiscovery package #9

Conversation

lobiCode commented May 24, 2017

dominikznidar left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lobiCode May 30, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

lobiCode May 30, 2017 •

edited

Loading