Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
569bbae
Master -> Develop merge (#569)
Railag Mar 1, 2019
ff59cc4
feat(core): scheduler access token ENG-718 (#567)
alexandershpak Mar 1, 2019
c6de1f2
feat(agent): add support of new metrics (#566)
mchepelev Mar 1, 2019
f2817ba
feat(tracking): use random tracking uuid (ENG-802) (#570)
mchepelev Mar 4, 2019
148f98a
feat(tracking): fix time tracking (#571)
mchepelev Mar 4, 2019
668b979
feat(security) security fields (ENG-772) (#572)
Railag Mar 5, 2019
e3f4a0d
add tracking request (#573)
tyatsiuk Mar 6, 2019
cbc601c
bug(fix) microservice update removes config (ENG-843) (#576)
epankou Mar 13, 2019
4ae6a6b
refactor(services): refactor and optimize service files (ENG-565)
mchepelev Mar 18, 2019
77fcbc4
Adding custom flags and k8s endpoints (#579)
baghbidi Apr 17, 2019
d9edfc5
Support Env vars and CMD in Pods (#580)
baghbidi Apr 18, 2019
e949146
Saeid/dockerfiles (#581)
baghbidi Apr 23, 2019
545120f
Add JRC and Attinad dev deployments (#582)
baghbidi Apr 26, 2019
af1c551
Update docker base image (#583)
baghbidi Apr 26, 2019
9429924
Travis bug fix (#584)
baghbidi Apr 26, 2019
81380a5
Remove JRC and Attinad deployments (#589)
baghbidi May 2, 2019
fbc1bb0
Fix ports publicMode validation (#590)
baghbidi May 2, 2019
deabeb3
Update dockerfiles and azure devops yaml (#591)
baghbidi May 2, 2019
43d997e
Return microservice public port url (#592)
baghbidi May 5, 2019
40b736e
integrated with azure pipelines to build, test, publish dev and relea…
rushminatorr May 7, 2019
8613adf
Merge pull request #593 from eclipse-iofog/feature/integrate-with-azu…
rushminatorr May 7, 2019
008823b
Support release branches in pipelines (#595)
sergerad May 8, 2019
ad4c2b2
refactor docker tagging
rushminatorr May 8, 2019
65c6e66
commit tag typo
rushminatorr May 8, 2019
af0ae7c
update var setup step
rushminatorr May 8, 2019
7aa09fe
Merge pull request #598 from eclipse-iofog/feature/refactor-tag-vars
rushminatorr May 9, 2019
9012e31
tag update for release branch
rushminatorr May 9, 2019
ff86f64
Merge pull request #599 from eclipse-iofog/feature/refactor-tag-vars
rushminatorr May 10, 2019
0a25475
update for internal and release artefacts
rushminatorr May 15, 2019
adfe9f6
Merge pull request #600 from eclipse-iofog/feature/artefact-release-p…
rushminatorr May 17, 2019
cd056eb
Add standardjs to CI
Pixcell May 26, 2019
077d563
Merge pull request #601 from eclipse-iofog/StandardJSInCI
Pixcell May 26, 2019
8163f7b
Move newman dependency to be accessible in docker
Pixcell May 26, 2019
1c8c4f8
Merge pull request #602 from eclipse-iofog/StandardJSInCI
Pixcell May 26, 2019
f8ce303
Add Snyk to CI
Pixcell May 26, 2019
79772b7
Merge pull request #603 from eclipse-iofog/AddSnykToCI
Pixcell May 26, 2019
6ef7c1b
Add variable group
Pixcell May 27, 2019
be96de8
Merge pull request #604 from eclipse-iofog/AddSnykToCI
Pixcell May 27, 2019
df35bb6
release candidate tag review
rushminatorr Jun 11, 2019
564a74c
Merge pull request #605 from eclipse-iofog/feature/review-tags
rushminatorr Jun 11, 2019
25aff0d
Update snapshot package version
rushminatorr Jun 12, 2019
4e78da0
Update snapshot package version
rushminatorr Jun 12, 2019
7869c45
Bump version
May 8, 2019
3f29f5f
Delete vritaul-kubelet service
May 10, 2019
87e11a7
Fixed re-install issue
May 14, 2019
1e5d133
Fixed update CMD
May 14, 2019
9d3f1cd
Add `release/*` to triggers
baghbidi May 15, 2019
97bbbfa
Update `nconf` version
May 15, 2019
cdefc38
Fixed issue with logger causing high CPU usage
May 16, 2019
00be880
Disable versioning
baghbidi May 16, 2019
e43d37d
Kubelet support
May 28, 2019
37b3bc9
Version
May 28, 2019
6daf818
Fixed microservice update bug
Jun 1, 2019
9602cf3
Add connector routes to the Controller API
Pixcell Jun 12, 2019
b7ba900
Change success return code of delete to 204
Pixcell Jun 12, 2019
346e3c0
Lint
Pixcell Jun 12, 2019
658e5d1
Add unit tests and postman tests
Pixcell Jun 12, 2019
f7b15ad
Merge pull request #608 from eclipse-iofog/AddConnectorAPIRoutes
Pixcell Jun 13, 2019
bbe6da3
Release/1.0.38 (#609)
baghbidi Jun 14, 2019
a4f147e
revert build pipeline changes
rushminatorr Jun 15, 2019
87e1fae
Minor fixes (#612)
baghbidi Jun 19, 2019
53d91e1
release candidate suffix
rushminatorr Jun 19, 2019
6a992db
remove platform build invokation
rushminatorr Jun 19, 2019
b7d8d33
Fixed DB migration bug (#613)
baghbidi Jun 20, 2019
0159867
`develop` PR validation
baghbidi Jun 20, 2019
50ed775
PR validation condition
baghbidi Jun 20, 2019
711dd8b
update docker tag from commit to buildid
rushminatorr Jun 20, 2019
91ce615
missing suffix in docker tag
rushminatorr Jun 20, 2019
553196e
Handle SQLITE_BUSY error (#615)
baghbidi Jun 23, 2019
9c10815
Version 1.1.0
Jun 23, 2019
6bcad26
Merge branch 'master' into develop
baghbidi Jun 24, 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
3 changes: 3 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ module.exports = {

'extends': 'google',
'rules': {
"linebreak-style": 0,
'require-jsdoc': [OFF, {
'require': {
'FunctionDeclaration': true,
Expand All @@ -19,6 +20,8 @@ module.exports = {
'no-invalid-this': OFF,
'no-multi-str': OFF,
'semi': [ERROR, 'never'],
'space-before-function-paren': OFF,
'object-curly-spacing': ['error', 'always'],
},

'parserOptions': {
Expand Down
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,8 @@ node_modules
.vscode
*.sqlite
.nyc_output
/.idea
/src/config/tracking-uuid
*.sqlite-shm
*.sqlite-wal
*.pid
4 changes: 4 additions & 0 deletions .snyk
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Snyk (https://snyk.io) policy file, patches or ignores known vulnerabilities.
version: v1.13.5
ignore: {}
patch: {}
80 changes: 0 additions & 80 deletions .travis.yml

This file was deleted.

13 changes: 13 additions & 0 deletions Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
FROM iofog/node-alpine-x86:8.16.0

ARG FILENAME
ENV NODE_ENV=development

COPY ${FILENAME} /tmp

RUN npm i --unsafe-perm -g /tmp/${FILENAME} && \
rm -rf /tmp/${FILENAME} && \
iofog-controller config dev-mode --on && \
echo "iofog-controller start && tail -f /dev/null" >> /start.sh

CMD [ "sh", "/start.sh" ]
11 changes: 11 additions & 0 deletions Dockerfile.rel
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM iofog/node-alpine-x86:8.16.0

ARG FILENAME

COPY ${FILENAME} /tmp

RUN npm i --unsafe-perm -g /tmp/${FILENAME} && \
rm -rf /tmp/${FILENAME} && \
echo "iofog-controller start && tail -f /dev/null" >> /start.sh

CMD [ "sh", "/start.sh" ]
170 changes: 170 additions & 0 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,170 @@
trigger:
tags:
include:
- v.*
branches:
include:
- develop
- release*
paths:
exclude:
- README.md

pr:
- master
- develop

variables:
group: 'pipelines'
repository: 'focal-freedom-236620/controller'
primaryTag: $(Build.SourceBranchName)
releaseCandidate: 'rc1'

jobs:
- job: Controller
pool:
vmImage: 'Ubuntu-16.04'

steps:
- task: NodeTool@0
inputs:
versionSpec: '8.x'
displayName: 'Install Node.js'

- script: |
npm install
displayName: 'npm install and build'

# When we are ready to enforce standardjs, remove redirection and remove '|| true' from the standard script in package.json
- script: |
npm run standard 2>&1 | tee standardjs.out
displayName: 'Standardjs report'

- script: |
npm run snyk -- --project-name=ControllerCI
displayName: 'Snyk monitor'
env:
SNYK_TOKEN: $(snykToken)

- script: |
npm test
displayName: 'unit tests'

- script: |
echo "npm test"
displayName: 'integration tests'

- script: |
echo "##vso[task.setvariable variable=agent.jobstatus;]canceled"
echo "##vso[task.complete result=Canceled;]DONE"
condition: eq(variables['Build.Reason'], 'PullRequest')

- script: |
npm pack
ls iofogcontroller-*.tgz
displayName: 'npm pack for release artefact'

- task: CopyFiles@2
inputs:
SourceFolder: $(System.DefaultWorkingDirectory)
TargetFolder: $(Build.ArtifactStagingDirectory)
Contents: |
standardjs.out
*.tgz
Dockerfile.dev
OverWrite: true
displayName: 'artefacts to publish'

- script: |
rm -fr iofogcontroller-*.tgz
git checkout package-lock.json
git config --global user.email "info@edgeworx.io"
git config --global user.name "Azure DevOps"

PACKAGE_VERSION=$(cat package.json | grep version | head -1 | awk -F: '{ print $2 }' | sed 's/[\",]//g' | tr -d '[[:space:]]')
if [[ $(Build.SourceBranch) == refs/heads/release* ]]; then
npm --no-git-tag-version version $PACKAGE_VERSION-$(releaseCandidate)-b$(Build.BuildId)
else
npm --no-git-tag-version version $PACKAGE_VERSION-b$(Build.BuildId)
fi
displayName: 'npm version'

- script: |
npm pack
displayName: 'npm pack with version containing build number'

- bash: |
echo 'checking pack file exists..'
tar=$(ls iofogcontroller-*.tgz)
echo $tar
echo "##vso[task.setvariable variable=controller_tar]$tar"

echo 'setting secondary tag'
echo "##vso[task.setvariable variable=secondaryTag]b-$(Build.BuildId)"

if [[ $(Build.SourceBranch) == refs/heads/release* ]]; then
echo "##vso[task.setvariable variable=primaryTag]rc-$(Build.SourceBranchName)"
#If branch starts with ref/tags, apply latest and version tag
elif [[ $(Build.SourceBranch) == refs/tags* ]]; then
primaryTag= echo $(primaryTag) | awk '{print substr($1,2);}'
echo $primaryTag
echo "##vso[task.setvariable variable=primaryTag]$primaryTag"
echo "##vso[task.setvariable variable=secondaryTag]latest"
fi
displayName: 'setting vars'
name: setvarStep

- task: Docker@2
displayName: 'build docker'
inputs:
containerRegistry: 'Edgeworx GCP'
repository: $(repository)
command: 'build'
Dockerfile: "Dockerfile.dev"
arguments: --build-arg FILENAME=$(controller_tar)
tags: |
$(secondaryTag)
$(primaryTag)

- task: Docker@2
displayName: 'push docker'
inputs:
containerRegistry: 'Edgeworx GCP'
repository: $(repository)
command: 'push'
Dockerfile: "Dockerfile.dev"
tags: |
$(secondaryTag)
$(primaryTag)

- script: |
echo "npm test"
displayName: 'api tests'

- task: PublishBuildArtifacts@1
inputs:
PathtoPublish: '$(Build.ArtifactStagingDirectory)'
ArtifactName: 'controller'

- task: DownloadSecureFile@1
inputs:
secureFile: 'package_cloud'
displayName: 'download package cloud token file'

- task: UseRubyVersion@0
inputs:
versionSpec: '>= 2.5'
addToPath: true
displayName: 'install rubygem to be used to install package_cloud cli'

- script: |
gem install package_cloud
package_cloud -h
echo "config file..."
echo $DOWNLOADSECUREFILE_SECUREFILEPATH
displayName: 'install package_cloud cli'

- script: |
echo $(controller_tar)
package_cloud push iofog/iofog-controller-snapshots/node/1 $(controller_tar) --config=$DOWNLOADSECUREFILE_SECUREFILEPATH
displayName: 'push to package cloud'
Loading