Skip to content

Commit

Permalink
fix: lint
Browse files Browse the repository at this point in the history
  • Loading branch information
ZavenArra committed Feb 9, 2022
1 parent 2a8b245 commit bdb1672
Show file tree
Hide file tree
Showing 5 changed files with 58 additions and 52 deletions.
30 changes: 12 additions & 18 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,49 +7,43 @@

## [1.7.4](https://github.com/Greenstand/treetracker-earnings/compare/v1.7.3...v1.7.4) (2022-02-09)


### Bug Fixes

* update deployment for database migrations ([91e7b3e](https://github.com/Greenstand/treetracker-earnings/commit/91e7b3e8ba75e24bd6c89f76b9bcb51bb11e98bf))
- update deployment for database migrations ([91e7b3e](https://github.com/Greenstand/treetracker-earnings/commit/91e7b3e8ba75e24bd6c89f76b9bcb51bb11e98bf))

## [1.7.3](https://github.com/Greenstand/treetracker-earnings/compare/v1.7.2...v1.7.3) (2022-02-09)


### Bug Fixes

* also use default node pool ([7809bd0](https://github.com/Greenstand/treetracker-earnings/commit/7809bd0fdac251d7c530f118903d2d6b683e225d))
* do not echo database connection string ([d38c2c7](https://github.com/Greenstand/treetracker-earnings/commit/d38c2c7dc2ad87236fda2966a8c602a6f4ded36d))
* update deployment for database migrations ([cdb32e8](https://github.com/Greenstand/treetracker-earnings/commit/cdb32e87f227fb2f181960a59d3ef9e40ed4ccc7))
- also use default node pool ([7809bd0](https://github.com/Greenstand/treetracker-earnings/commit/7809bd0fdac251d7c530f118903d2d6b683e225d))
- do not echo database connection string ([d38c2c7](https://github.com/Greenstand/treetracker-earnings/commit/d38c2c7dc2ad87236fda2966a8c602a6f4ded36d))
- update deployment for database migrations ([cdb32e8](https://github.com/Greenstand/treetracker-earnings/commit/cdb32e87f227fb2f181960a59d3ef9e40ed4ccc7))

## [1.7.2](https://github.com/Greenstand/treetracker-earnings/compare/v1.7.1...v1.7.2) (2022-02-08)


### Bug Fixes

* update image name ([1280381](https://github.com/Greenstand/treetracker-earnings/commit/12803817120d0d000a64df368b007036c959f8ff))
- update image name ([1280381](https://github.com/Greenstand/treetracker-earnings/commit/12803817120d0d000a64df368b007036c959f8ff))

## [1.7.1](https://github.com/Greenstand/treetracker-earnings/compare/v1.7.0...v1.7.1) (2022-02-08)


### Bug Fixes

* add capture count column ([c0e5c18](https://github.com/Greenstand/treetracker-earnings/commit/c0e5c184460732e60001e2391e3b8f429fa968b4))
* move expect-runtime to dependencies ([ccda0b6](https://github.com/Greenstand/treetracker-earnings/commit/ccda0b6ea6ea96e13acca482c97e5a311a4a4536))
* remove schema from migration ([7bbf926](https://github.com/Greenstand/treetracker-earnings/commit/7bbf92694e0f323d259350d07e21a184935c8766))
- add capture count column ([c0e5c18](https://github.com/Greenstand/treetracker-earnings/commit/c0e5c184460732e60001e2391e3b8f429fa968b4))
- move expect-runtime to dependencies ([ccda0b6](https://github.com/Greenstand/treetracker-earnings/commit/ccda0b6ea6ea96e13acca482c97e5a311a4a4536))
- remove schema from migration ([7bbf926](https://github.com/Greenstand/treetracker-earnings/commit/7bbf92694e0f323d259350d07e21a184935c8766))

# [1.7.0](https://github.com/Greenstand/treetracker-earnings/compare/v1.6.0...v1.7.0) (2022-02-08)


### Bug Fixes

* add logic to manage cors for dev env ([c56219b](https://github.com/Greenstand/treetracker-earnings/commit/c56219b3d35570e5dfe7d6e78a3fd016679217dc))
* linted ([84d0232](https://github.com/Greenstand/treetracker-earnings/commit/84d0232710b1fd4a3bdd2eb7249e0837e88c760b))
* update api request to stakeholder tool ([08b9819](https://github.com/Greenstand/treetracker-earnings/commit/08b98197030f63e8c8320955a9db82442475f1f7))

- add logic to manage cors for dev env ([c56219b](https://github.com/Greenstand/treetracker-earnings/commit/c56219b3d35570e5dfe7d6e78a3fd016679217dc))
- linted ([84d0232](https://github.com/Greenstand/treetracker-earnings/commit/84d0232710b1fd4a3bdd2eb7249e0837e88c760b))
- update api request to stakeholder tool ([08b9819](https://github.com/Greenstand/treetracker-earnings/commit/08b98197030f63e8c8320955a9db82442475f1f7))

### Features

* default sort by paid_at ([d90b147](https://github.com/Greenstand/treetracker-earnings/commit/d90b14788f62c084c4aadc1af13c51b8e09ff1bc))
- default sort by paid_at ([d90b147](https://github.com/Greenstand/treetracker-earnings/commit/d90b14788f62c084c4aadc1af13c51b8e09ff1bc))

# [1.6.0](https://github.com/Greenstand/treetracker-earnings/compare/v1.5.0...v1.6.0) (2022-02-08)

Expand Down
40 changes: 23 additions & 17 deletions database/migrations/20220205071300-AddColumnCapturesCount.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,45 +5,51 @@ const fs = require('fs');
const path = require('path');

/**
* We receive the dbmigrate dependency from dbmigrate initially.
* This enables us to not have to rely on NODE_PATH.
*/
exports.setup = function(options, seedLink) {
* We receive the dbmigrate dependency from dbmigrate initially.
* This enables us to not have to rely on NODE_PATH.
*/
exports.setup = function (options, seedLink) {
dbm = options.dbmigrate;
type = dbm.dataType;
seed = seedLink;
};

exports.up = function(db) {
const filePath = path.join(__dirname, 'sqls', '20220205071300-AddColumnCapturesCount-up.sql');
return new Promise( function( resolve, reject ) {
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
exports.up = function (db) {
const filePath = path.join(
__dirname,
'sqls',
'20220205071300-AddColumnCapturesCount-up.sql',
);
return new Promise(function (resolve, reject) {
fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
if (err) return reject(err);
console.log('received data: ', data);

resolve(data);
});
})
.then(function(data) {
}).then(function (data) {
return db.runSql(data);
});
};

exports.down = function(db) {
const filePath = path.join(__dirname, 'sqls', '20220205071300-AddColumnCapturesCount-down.sql');
return new Promise( function( resolve, reject ) {
fs.readFile(filePath, {encoding: 'utf-8'}, function(err,data){
exports.down = function (db) {
const filePath = path.join(
__dirname,
'sqls',
'20220205071300-AddColumnCapturesCount-down.sql',
);
return new Promise(function (resolve, reject) {
fs.readFile(filePath, { encoding: 'utf-8' }, function (err, data) {
if (err) return reject(err);
console.log('received data: ', data);

resolve(data);
});
})
.then(function(data) {
}).then(function (data) {
return db.runSql(data);
});
};

exports._meta = {
"version": 1
version: 1,
};
12 changes: 6 additions & 6 deletions deployment/base/cluster-role.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ kind: ClusterRole
metadata:
name: k8s-wait-for
rules:
- apiGroups: [""]
resources: ["services","pods","jobs"]
verbs: ["get","watch","list"]
- apiGroups: ["batch"]
resources: ["services","pods","jobs"]
verbs: ["get","watch","list"]
- apiGroups: ['']
resources: ['services', 'pods', 'jobs']
verbs: ['get', 'watch', 'list']
- apiGroups: ['batch']
resources: ['services', 'pods', 'jobs']
verbs: ['get', 'watch', 'list']
27 changes: 17 additions & 10 deletions deployment/base/database-migration-job.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,21 @@ spec:
template:
spec:
containers:
- name: migration
image: greenstand/treetracker-earnings-api:TAG
env:
- name: DATABASE_URL
valueFrom:
secretKeyRef:
name: database-migration-connection
key: db
command: ["node"]
args: ["node_modules/db-migrate/bin/db-migrate", "up", "--migrations-dir", "database/migrations/", "-v"]
- name: migration
image: greenstand/treetracker-earnings-api:TAG
env:
- name: DATABASE_URL
valueFrom:
secretKeyRef:
name: database-migration-connection
key: db
command: ['node']
args:
[
'node_modules/db-migrate/bin/db-migrate',
'up',
'--migrations-dir',
'database/migrations/',
'-v',
]
restartPolicy: Never
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,3 @@ spec:
creationTimestamp: null
name: database-migration-connection
namespace: earnings-api

0 comments on commit bdb1672

Please sign in to comment.