Skip to content

DVPL-9708 apps/local support #135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 11, 2021
Merged

DVPL-9708 apps/local support #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5553034
Changes for sdk-app-collection and apps/local
vmalaviya-splunk Aug 10, 2021
c9f2e45
Updated docker-compose.yml and test.yml
vmalaviya-splunk Aug 10, 2021
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
20 changes: 10 additions & 10 deletions .github/workflows/test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ on: [push, pull_request]
jobs:
build:
runs-on: ${{ matrix.os }}

strategy:
matrix:
os:
Expand All @@ -15,29 +15,29 @@ jobs:
- 8.17.0
splunk-version:
- "8.0"
- "latest"
- "latest"

services:
splunk:
image: splunk/splunk:${{matrix.splunk-version}}
env:
SPLUNK_START_ARGS: --accept-license
SPLUNK_HEC_TOKEN: 11111111-1111-1111-1111-1111111111113
SPLUNK_PASSWORD: changed!
SPLUNK_APPS_URL: https://github.com/splunk/sdk-app-collection/releases/download/v1.0.0/sdk-app-collection.tgz
SPLUNK_APPS_URL: https://github.com/splunk/sdk-app-collection/releases/download/v1.1.0/sdkappcollection.tgz
ports:
- 8000:8000
- 8088:8088
- 8089:8089

steps:
- uses: actions/checkout@v2

- name: Use node ${{ matrix.node }}
uses: actions/setup-node@v2
with:
node-version: ${{ matrix.node }}

- name: Create .splunkrc file
run: |
cd ~
Expand All @@ -47,10 +47,10 @@ jobs:
echo password=changed! >> .splunkrc
echo scheme=https >> .splunkrc
echo version=${{ matrix.splunk }} >> .splunkrc

- name: Run npm install
run: npm install
run: npm install

- name: Run make test
run: make test
env:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
- SPLUNK_START_ARGS=--accept-license
- SPLUNK_HEC_TOKEN=11111111-1111-1111-1111-1111111111113
- SPLUNK_PASSWORD=changed!
- SPLUNK_APPS_URL=https://github.com/splunk/sdk-app-collection/releases/download/v1.0.0/sdk-app-collection.tgz
- SPLUNK_APPS_URL=https://github.com/splunk/sdk-app-collection/releases/download/v1.1.0/sdkappcollection.tgz
ports:
- 8000:8000
- 8088:8088
Expand Down
289 changes: 139 additions & 150 deletions tests/service_tests/job.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,39 +19,37 @@ exports.setup = function (svc) {
done();
});

// Disabling this test because apps/appinstall endpoint is deprecated in Splunk 8.2.
//
// it("Callback#Create+abort job", function (done) {
// var service = this.service;
// Async.chain([
// function (done) {
// var app_name = path.join(process.env.SPLUNK_HOME, ('/etc/apps/sdkappcollection/build/sleep_command.tar'));
// // Fix path on Windows if $SPLUNK_HOME contains a space (ex: C:/Program%20Files/Splunk)
// app_name = app_name.replace("%20", " ");
// // var app_name = "sleep_command";
// service.post("apps/local", { update: 1, name: app_name, filename: true }, done);
// },
// function (done) {
// var sid = getNextId();
// var options = { id: sid };
// var jobs = service.jobs();
// var req = jobs.oneshotSearch('search index=_internal | head 1 | sleep 10', options, function (err, job) {
// assert.ok(err);
// assert.ok(!job);
// assert.strictEqual(err.error, "abort");
// });

// Async.sleep(1000, function () {
// req.abort();
// });
// }
// ],
// function (err) {
// assert.ok(!err);
// done();
// });
// done();
// });
it("Callback#Create+abort job", function (done) {
var service = this.service;
Async.chain([
function (done) {
var app_name = path.join(process.env.SPLUNK_HOME, ('/etc/apps/sdkappcollection/build/sleep_command.tar'));
// Fix path on Windows if $SPLUNK_HOME contains a space (ex: C:/Program%20Files/Splunk)
app_name = app_name.replace("%20", " ");
// var app_name = "sleep_command";
service.post("apps/local", { update: 1, name: app_name, filename: true }, done);
},
function (done) {
var sid = getNextId();
var options = { id: sid };
var jobs = service.jobs();
var req = jobs.oneshotSearch('search index=_internal | head 1 | sleep 10', options, function (err, job) {
assert.ok(err);
assert.ok(!job);
assert.strictEqual(err.error, "abort");
});

Async.sleep(1000, function () {
req.abort();
});
}
],
function (err) {
assert.ok(!err);
done();
});
done();
});

it("Callback#Create+cancel job", function (done) {
var sid = getNextId();
Expand Down Expand Up @@ -275,92 +273,86 @@ exports.setup = function (svc) {
);
});

// Disabling this test because apps/appinstall endpoint is deprecated in Splunk 8.2.
//
//
// it("Callback#Enable + disable preview", function (done) {
// var that = this;
// var sid = getNextId();
it("Callback#Enable + disable preview", function (done) {
var that = this;
var sid = getNextId();

// var service = this.service.specialize("nobody", "sdkappcollection");
var service = this.service.specialize("nobody", "sdkappcollection");

// Async.chain([
// function (done) {
// service.jobs().search('search index=_internal | head 1 | sleep 60', { id: sid }, done);
// },
// function (job, done) {
// job.enablePreview(done);

// },
// function (job, done) {
// job.disablePreview(done);
// },
// function (job, done) {
// job.cancel(done);
// }
// ],
// function (err) {
// assert.ok(!err);
// done();
// }
// );
// });
Async.chain([
function (done) {
service.jobs().search('search index=_internal | head 1 | sleep 60', { id: sid }, done);
},
function (job, done) {
job.enablePreview(done);

},
function (job, done) {
job.disablePreview(done);
},
function (job, done) {
job.cancel(done);
}
],
function (err) {
assert.ok(!err);
done();
}
);
});

// Disabling this test because apps/appinstall endpoint is deprecated in Splunk 8.2.
//
//
// it("Callback#Pause + unpause + finalize preview", function (done) {
// var that = this;
// var sid = getNextId();

// var service = this.service.specialize("nobody", "sdkappcollection");
it("Callback#Pause + unpause + finalize preview", function (done) {
var that = this;
var sid = getNextId();

// Async.chain([
// function (done) {
// service.jobs().search('search index=_internal | head 1 | sleep 5', { id: sid }, done);
// },
// function (job, done) {
// job.pause(done);
// },
// function (job, done) {
// tutils.pollUntil(
// job,
// function (j) {
// return j.properties()["isPaused"];
// },
// 10,
// done
// );
// },
// function (job, done) {
// assert.ok(job.properties()["isPaused"]);
// job.unpause(done);
// },
// function (job, done) {
// tutils.pollUntil(
// job,
// function (j) {
// return !j.properties()["isPaused"];
// },
// 10,
// done
// );
// },
// function (job, done) {
// assert.ok(!job.properties()["isPaused"]);
// job.finalize(done);
// },
// function (job, done) {
// job.cancel(done);
// }
// ],
// function (err) {
// assert.ok(!err);
// done();
// }
// );
// });
var service = this.service.specialize("nobody", "sdkappcollection");

Async.chain([
function (done) {
service.jobs().search('search index=_internal | head 1 | sleep 5', { id: sid }, done);
},
function (job, done) {
job.pause(done);
},
function (job, done) {
tutils.pollUntil(
job,
function (j) {
return j.properties()["isPaused"];
},
10,
done
);
},
function (job, done) {
assert.ok(job.properties()["isPaused"]);
job.unpause(done);
},
function (job, done) {
tutils.pollUntil(
job,
function (j) {
return !j.properties()["isPaused"];
},
10,
done
);
},
function (job, done) {
assert.ok(!job.properties()["isPaused"]);
job.finalize(done);
},
function (job, done) {
job.cancel(done);
}
],
function (err) {
assert.ok(!err);
done();
}
);
});

it("Callback#Set TTL", function (done) {
var sid = getNextId();
Expand Down Expand Up @@ -397,45 +389,42 @@ exports.setup = function (svc) {
);
});

// Disabling this test because apps/appinstall endpoint is deprecated in Splunk 8.2.
//
//
// it("Callback#Set priority", function (done) {
// var sid = getNextId();
// var originalPriority = 0;
// var that = this;
it("Callback#Set priority", function (done) {
var sid = getNextId();
var originalPriority = 0;
var that = this;

// var service = this.service.specialize("nobody", "sdkappcollection");
var service = this.service.specialize("nobody", "sdkappcollection");

// Async.chain([
// function (done) {
// service.jobs().search('search index=_internal | head 1 | sleep 5', { id: sid }, done);
// },
// function (job, done) {
// job.track({}, {
// ready: function (job) {
// done(null, job);
// }
// });
// },
// function (job, done) {
// var priority = job.properties()["priority"];
// assert.ok(priority, 5);
// job.setPriority(priority + 1, done);
// },
// function (job, done) {
// job.fetch(done);
// },
// function (job, done) {
// job.cancel(done);
// }
// ],
// function (err) {
// assert.ok(!err);
// done();
// }
// );
// });
Async.chain([
function (done) {
service.jobs().search('search index=_internal | head 1 | sleep 5', { id: sid }, done);
},
function (job, done) {
job.track({}, {
ready: function (job) {
done(null, job);
}
});
},
function (job, done) {
var priority = job.properties()["priority"];
assert.ok(priority, 5);
job.setPriority(priority + 1, done);
},
function (job, done) {
job.fetch(done);
},
function (job, done) {
job.cancel(done);
}
],
function (err) {
assert.ok(!err);
done();
}
);
});

it("Callback#Search log", function (done) {
var sid = getNextId();
Expand Down
Loading