Skip to content

Commit 62a15d2

Browse files
Alan Shawdaviddias
Alan Shaw
authored and
daviddias
committed
feat: support passing profile init option (#321)
* feat: support passing profile init option License: MIT Signed-off-by: Alan Shaw <alan.shaw@protocol.ai> * fix: only use profile for go-ipfs, not supported in js-ipfs yet License: MIT Signed-off-by: Alan Shaw <alan.shaw@protocol.ai> * refactor: use test profile in tests License: MIT Signed-off-by: Alan Shaw <alan.shaw@protocol.ai> * refactor: log when ignoring profile option License: MIT Signed-off-by: Alan Shaw <alan.shaw@protocol.ai>
1 parent fb4d51b commit 62a15d2

6 files changed

+31
-21
lines changed

‎src/ipfsd-daemon.js

+9
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,15 @@ class Daemon {
174174
args.push('--pass')
175175
args.push('"' + initOptions.pass + '"')
176176
}
177+
if (initOptions.profile) {
178+
// TODO: remove when JS IPFS supports profiles
179+
if (this.opts.type === 'go') {
180+
args.push('-p')
181+
args.push(initOptions.profile)
182+
} else {
183+
log(`ignoring "profile" option, not supported for ${this.opts.type} node`)
184+
}
185+
}
177186
run(this, args, { env: this.env }, (err, result) => {
178187
if (err) {
179188
return callback(err)

‎test/add-retrieve.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ describe('data can be put and fetched', () => {
2525

2626
const f = IPFSFactory.create(dfOpts)
2727

28-
f.spawn({ initOptions: { bits: dfOpts.bits } }, (err, _ipfsd) => {
28+
f.spawn({ initOptions: { bits: dfOpts.bits, profile: 'test' } }, (err, _ipfsd) => {
2929
expect(err).to.not.exist()
3030
expect(_ipfsd).to.exist()
3131
expect(_ipfsd.api).to.exist()

‎test/api.spec.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ describe('ipfsd.api for Daemons', () => {
5050
df.spawn({
5151
start: false,
5252
config: config,
53-
initOptions: { bits: 1024 }
53+
initOptions: { bits: 1024, profile: 'test' }
5454
}, (err, _ipfsd) => {
5555
expect(err).to.not.exist()
5656
ipfsd = _ipfsd
@@ -94,7 +94,7 @@ describe('ipfsd.api for Daemons', () => {
9494

9595
df.spawn({
9696
config: config,
97-
initOptions: { bits: 1024 }
97+
initOptions: { bits: 1024, profile: 'test' }
9898
}, (err, _ipfsd) => {
9999
expect(err).to.not.exist()
100100
const ipfsd = _ipfsd

‎test/custom-api.spec.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('custom API', function () {
2222
IpfsClient: () => mockApi
2323
})
2424

25-
f.spawn((err, ipfsd) => {
25+
f.spawn({ initOptions: { profile: 'test' } }, (err, ipfsd) => {
2626
if (err) return done(err)
2727
expect(ipfsd.api).to.equal(mockApi)
2828
// Restore a real API so that the node can be stopped properly

‎test/spawn-options.spec.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ describe('Spawn options', function () {
7373
init: false,
7474
start: false,
7575
disposable: false,
76-
initOptions: { bits: fOpts.bits }
76+
initOptions: { bits: fOpts.bits, profile: 'test' }
7777
}
7878

7979
f.spawn(options, (err, _ipfsd) => {
@@ -167,7 +167,7 @@ describe('Spawn options', function () {
167167
it('create init and start node', function (done) {
168168
this.timeout(20 * 1000)
169169

170-
f.spawn({ initOptions: { bits: fOpts.bits } },
170+
f.spawn({ initOptions: { bits: fOpts.bits, profile: 'test' } },
171171
(err, _ipfsd) => {
172172
expect(err).to.not.exist()
173173
expect(_ipfsd).to.exist()
@@ -213,7 +213,8 @@ describe('Spawn options', function () {
213213
f.spawn({
214214
defaultAddrs: true,
215215
initOptions: {
216-
bits: fOpts.bits
216+
bits: fOpts.bits,
217+
profile: 'test'
217218
}
218219
}, (err, ipfsd) => {
219220
expect(err).to.not.exist()
@@ -246,7 +247,7 @@ describe('Spawn options', function () {
246247
Bootstrap: ['/dns4/wss0.bootstrap.libp2p.io/tcp/443/wss/ipfs/QmZMxNdpMkewiVZLMRxaNxUeZpDUb34pWjZ1kZvsd16Zic']
247248
}
248249

249-
const options = { config: config, initOptions: { bits: fOpts.bits } }
250+
const options = { config: config, initOptions: { bits: fOpts.bits, profile: 'test' } }
250251

251252
waterfall([
252253
(cb) => f.spawn(options, cb),
@@ -317,7 +318,7 @@ describe('Spawn options', function () {
317318
start: false,
318319
repoPath: repoPath,
319320
config: config,
320-
initOptions: { bits: fOpts.bits }
321+
initOptions: { bits: fOpts.bits, profile: 'test' }
321322
}
322323

323324
series([
@@ -357,7 +358,7 @@ describe('Spawn options', function () {
357358

358359
const options = {
359360
args: ['--enable-pubsub-experiment'],
360-
initOptions: { bits: fOpts.bits }
361+
initOptions: { bits: fOpts.bits, profile: 'test' }
361362
}
362363

363364
f.spawn(options, (err, _ipfsd) => {
@@ -396,7 +397,7 @@ describe('Spawn options', function () {
396397

397398
before(function (done) {
398399
this.timeout(20 * 1000)
399-
f.spawn({ initOptions: { bits: fOpts.bits } },
400+
f.spawn({ initOptions: { bits: fOpts.bits, profile: 'test' } },
400401
(err, _ipfsd) => {
401402
expect(err).to.not.exist()
402403
ipfsd = _ipfsd

‎test/start-stop.node.js

+10-10
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ tests.forEach((fOpts) => {
4444
init: true,
4545
start: false,
4646
disposable: true,
47-
initOptions: { bits: fOpts.bits }
47+
initOptions: { bits: fOpts.bits, profile: 'test' }
4848
}, (err, _ipfsd) => {
4949
expect(err).to.not.exist()
5050
expect(_ipfsd).to.exist()
@@ -135,7 +135,7 @@ tests.forEach((fOpts) => {
135135

136136
df.spawn({
137137
start: false,
138-
initOptions: { bits: fOpts.bits }
138+
initOptions: { bits: fOpts.bits, profile: 'test' }
139139
}, (err, ipfsd) => {
140140
expect(err).to.not.exist()
141141
ipfsd.start(['--should-not-exist'], (err) => {
@@ -165,7 +165,7 @@ tests.forEach((fOpts) => {
165165
init: true,
166166
start: false,
167167
disposable: true,
168-
initOptions: { bits: fOpts.bits }
168+
initOptions: { bits: fOpts.bits, profile: 'test' }
169169
}, (err, _ipfsd) => {
170170
expect(err).to.not.exist()
171171
expect(_ipfsd).to.exist()
@@ -247,7 +247,7 @@ tests.forEach((fOpts) => {
247247

248248
df.spawn({
249249
start: false,
250-
initOptions: { bits: fOpts.bits }
250+
initOptions: { bits: fOpts.bits, profile: 'test' }
251251
}, (err, ipfsd) => {
252252
expect(err).to.not.exist()
253253
ipfsd.start(['--should-not-exist'], (err) => {
@@ -270,7 +270,7 @@ tests.forEach((fOpts) => {
270270

271271
df.spawn({
272272
exec,
273-
initOptions: { bits: fOpts.bits }
273+
initOptions: { bits: fOpts.bits, profile: 'test' }
274274
}, (err, daemon) => {
275275
expect(err).to.not.exist()
276276
expect(daemon).to.exist()
@@ -302,7 +302,7 @@ tests.forEach((fOpts) => {
302302
process.env = Object.assign({}, process.env, fOpts.type === 'go'
303303
? { IPFS_GO_EXEC: exec } : { IPFS_JS_EXEC: exec })
304304
df.spawn({
305-
initOptions: { bits: fOpts.bits }
305+
initOptions: { bits: fOpts.bits, profile: 'test' }
306306
}, (err, daemon) => {
307307
expect(err).to.not.exist()
308308
expect(daemon).to.exist()
@@ -335,7 +335,7 @@ tests.forEach((fOpts) => {
335335

336336
df.spawn({
337337
exec,
338-
initOptions: { bits: fOpts.bits }
338+
initOptions: { bits: fOpts.bits, profile: 'test' }
339339
}, (err, daemon) => {
340340
expect(err).to.not.exist()
341341
expect(daemon).to.exist()
@@ -356,7 +356,7 @@ tests.forEach((fOpts) => {
356356

357357
const df = IPFSFactory.create(dfConfig)
358358
df.spawn({
359-
initOptions: { bits: fOpts.bits },
359+
initOptions: { bits: fOpts.bits, profile: 'test' },
360360
repoPath: ipfsd.repoPath,
361361
disposable: false
362362
}, (err, daemon) => {
@@ -383,7 +383,7 @@ tests.forEach((fOpts) => {
383383
init: false,
384384
start: false,
385385
exec: exec,
386-
initOptions: { bits: fOpts.bits }
386+
initOptions: { bits: fOpts.bits, profile: 'test' }
387387
}, (err, daemon) => {
388388
expect(err).to.not.exist()
389389
expect(daemon).to.exist()
@@ -418,7 +418,7 @@ tests.forEach((fOpts) => {
418418
start: false,
419419
disposable: false,
420420
repoPath: tempDir(fOpts.type),
421-
initOptions: { bits: fOpts.bits },
421+
initOptions: { bits: fOpts.bits, profile: 'test' },
422422
config: {
423423
Addresses: {
424424
Swarm: [`/ip4/127.0.0.1/tcp/0`],

0 commit comments

Comments
 (0)