logger: Remove pubnub leftovers

Change-type: minor
Signed-off-by: Petros Angelatos <petrosagg@gmail.com>

Dockerfile

@@ -101,8 +101,6 @@ RUN [ "cross-build-end" ]
 FROM resin/$ARCH-supervisor-base:v1.2.0
 ARG ARCH
 ARG VERSION=master
-ARG DEFAULT_PUBNUB_PUBLISH_KEY=pub-c-bananas
-ARG DEFAULT_PUBNUB_SUBSCRIBE_KEY=sub-c-bananas
 ARG DEFAULT_MIXPANEL_TOKEN=bananasbananas
 
 WORKDIR /usr/src/app
@@ -117,8 +115,6 @@ ENV CONFIG_MOUNT_POINT=/boot/config.json \
 	LED_FILE=/dev/null \
 	SUPERVISOR_IMAGE=resin/$ARCH-supervisor \
 	VERSION=$VERSION \
-	DEFAULT_PUBNUB_PUBLISH_KEY=$DEFAULT_PUBNUB_PUBLISH_KEY \
-	DEFAULT_PUBNUB_SUBSCRIBE_KEY=$DEFAULT_PUBNUB_SUBSCRIBE_KEY \
 	DEFAULT_MIXPANEL_TOKEN=$DEFAULT_MIXPANEL_TOKEN
 
 HEALTHCHECK --interval=5m --start-period=1m --timeout=30s --retries=3 \

Makefile

@@ -12,7 +12,7 @@
 # Variables for build targets:
 # * ARCH: amd64/rpi/i386/armv7hf/armel/aarch64 architecture for which to build the supervisor - default: amd64
 # * IMAGE: image to build or deploy - default: resin/$(ARCH)-supervisor:latest
-# * MIXPANEL_TOKEN, PUBNUB_SUBSCRIBE_KEY, PUBNUB_PUBLISH_KEY: (optional) default pubnub and mixpanel keys to embed in the supervisor image
+# * MIXPANEL_TOKEN: (optional) default mixpanel key to embed in the supervisor image
 # * DISABLE_CACHE: if set to true, run build with no cache - default: false
 # * DOCKER_BUILD_OPTIONS: Additional options for docker build, like --cache-from parameters
 #
@@ -69,9 +69,7 @@ DOCKER_MAJOR_VERSION:=$(word 1, $(subst ., ,$(DOCKER_VERSION)))
 DOCKER_MINOR_VERSION:=$(word 2, $(subst ., ,$(DOCKER_VERSION)))
 DOCKER_GE_17_05 := $(shell [ $(DOCKER_MAJOR_VERSION) -gt 17 -o \( $(DOCKER_MAJOR_VERSION) -eq 17 -a $(DOCKER_MINOR_VERSION) -ge 5 \) ] && echo true)
 
-# Default values for Pubnub and Mixpanel keys
-PUBNUB_SUBSCRIBE_KEY ?= sub-c-bananas
-PUBNUB_PUBLISH_KEY ?= pub-c-bananas
+# Default values for Mixpanel key
 MIXPANEL_TOKEN ?= bananasbananas
 
 # Default architecture and output image
@@ -151,8 +149,6 @@ endif
 		--no-cache=$(DISABLE_CACHE) \
 		--build-arg ARCH=$(ARCH) \
 		--build-arg VERSION=$(shell jq -r .version package.json) \
-		--build-arg DEFAULT_PUBNUB_PUBLISH_KEY=$(PUBNUB_PUBLISH_KEY) \
-		--build-arg DEFAULT_PUBNUB_SUBSCRIBE_KEY=$(PUBNUB_SUBSCRIBE_KEY) \
 		--build-arg DEFAULT_MIXPANEL_TOKEN=$(MIXPANEL_TOKEN) \
 		-t $(IMAGE) .
 

README.md

@@ -32,8 +32,6 @@ The `config.json` file should look something like this:
 	"apiEndpoint": "https://api.resinstaging.io", /* Endpoint for the resin.io API */
 	"deltaEndpoint": "https://delta.resinstaging.io", /* Endpoint for the delta server to download Docker binary diffs */
 	"vpnEndpoint": "vpn.resinstaging.io", /* Endpoint for the resin.io VPN server */
-	"pubnubSubscribeKey": "sub-c-aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", /* Subscribe key for Pubnub for logs */
-	"pubnubPublishKey": "pub-c-aaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa", /* Publish key for Pubnub for logs */
 	"listenPort": 48484, /* Listen port for the supervisor API */
 	"mixpanelToken": "aaaaaaaaaaaaaaaaaaaaaaaaaa", /* Mixpanel token to report events */
 }

automation/build.sh

@@ -10,7 +10,7 @@
 # * PUSH_IMAGES
 # * CLEANUP
 # * ENABLE_TESTS
-# * PUBNUB_SUBSCRIBE_KEY, PUBNUB_PUBLISH_KEY, MIXPANEL_TOKEN: default keys to inject in the supervisor image
+# * MIXPANEL_TOKEN: default key to inject in the supervisor image
 # * EXTRA_TAG: when PUSH_IMAGES is true, additional tag to push to the registries
 #
 # Builds the supervisor for the architecture defined by $ARCH.
@@ -76,8 +76,6 @@ tryPullForCache $NODE_BUILD_CACHE_MASTER
 
 export DOCKER_BUILD_OPTIONS=${CACHE_FROM}
 export ARCH
-export PUBNUB_PUBLISH_KEY
-export PUBNUB_SUBSCRIBE_KEY
 export MIXPANEL_TOKEN
 
 make IMAGE=$NODE_BUILD_IMAGE nodebuild

package.json

@@ -62,7 +62,6 @@
     "node-loader": "^0.6.0",
     "null-loader": "^0.1.1",
     "pinejs-client": "^2.4.0",
-    "pubnub": "^3.7.13",
     "register-coffee-coverage": "0.0.1",
     "request": "^2.51.0",
     "resin-lint": "^1.5.7",

src/config.ts

@@ -38,8 +38,6 @@ class Config extends EventEmitter {
 		registered_at: { source: 'config.json', mutable: true },
 		applicationId: { source: 'config.json' },
 		appUpdatePollInterval: { source: 'config.json', mutable: true, default: 60000 },
-		pubnubSubscribeKey: { source: 'config.json', default: constants.defaultPubnubSubscribeKey },
-		pubnubPublishKey: { source: 'config.json', default: constants.defaultPubnubPublishKey },
 		mixpanelToken: { source: 'config.json', default: constants.defaultMixpanelToken },
 		bootstrapRetryDelay: { source: 'config.json', default: 30000 },
 		supervisorOfflineMode: { source: 'config.json', default: false },
@@ -49,7 +47,6 @@ class Config extends EventEmitter {
 		version: { source: 'func' },
 		currentApiKey: { source: 'func' },
 		offlineMode: { source: 'func' },
-		pubnub: { source: 'func' },
 		provisioned: { source: 'func' },
 		osVersion: { source: 'func' },
 		osVariant: { source: 'func' },
@@ -75,7 +72,6 @@ class Config extends EventEmitter {
 		deltaVersion: { source: 'db', mutable: true, default: '2' },
 		lockOverride: { source: 'db', mutable: true, default: 'false' },
 		legacyAppsPresent: { source: 'db', mutable: true, default: 'false' },
-		nativeLogger: { source: 'db', mutable: true, default: 'true' },
 		// a JSON value, which is either null, or { app: number, commit: string }
 		pinDevice: { source: 'db', mutable: true, default: 'null' },
 		currentCommit: { source: 'db', mutable: true },

src/config/functions.ts

@@ -47,18 +47,6 @@ export function createProviderFunctions(config: Config): ConfigProviderFunctions
 					});
 			},
 		},
-		pubnub: {
-			get: () => {
-				return config.getMany([ 'pubnubSubscribeKey', 'pubnubPublishKey' ])
-					.then(({ pubnubSubscribeKey, pubnubPublishKey }) => {
-						return {
-							subscribe_key: pubnubSubscribeKey,
-							publish_key: pubnubPublishKey,
-							ssl: true,
-						};
-					});
-			},
-		},
 		provisioned: {
 			get: () => {
 				return config.getMany([

src/device-config.coffee

@@ -23,7 +23,6 @@ module.exports = class DeviceConfig
 			deltaRetryInterval: { envVarName: 'RESIN_SUPERVISOR_DELTA_RETRY_INTERVAL', varType: 'int', defaultValue: '10000' }
 			deltaVersion: { envVarName: 'RESIN_SUPERVISOR_DELTA_VERSION', varType: 'int', defaultValue: '2' }
 			lockOverride: { envVarName: 'RESIN_SUPERVISOR_OVERRIDE_LOCK', varType: 'bool', defaultValue: 'false' }
-			nativeLogger: { envVarName: 'RESIN_SUPERVISOR_NATIVE_LOGGER', varType: 'bool', defaultValue: 'true' }
 			persistentLogging: { envVarName: 'RESIN_SUPERVISOR_PERSISTENT_LOGGING', varType: 'bool', defaultValue: 'false', rebootRequired: true }
 		}
 		@validKeys = [

src/lib/constants.ts

@@ -26,8 +26,6 @@ const constants = {
 	proxyvisorHookReceiver:
 		checkString(process.env.RESIN_PROXYVISOR_HOOK_RECEIVER) || 'http://0.0.0.0:1337',
 	configJsonNonAtomicPath: '/boot/config.json',
-	defaultPubnubSubscribeKey: process.env.DEFAULT_PUBNUB_SUBSCRIBE_KEY,
-	defaultPubnubPublishKey: process.env.DEFAULT_PUBNUB_PUBLISH_KEY,
 	defaultMixpanelToken: process.env.DEFAULT_MIXPANEL_TOKEN,
 	supervisorNetworkInterface: supervisorNetworkInterface,
 	allowedInterfaces: [ 'resin-vpn', 'tun0', 'docker0', 'lo', supervisorNetworkInterface ],

test/03-config.spec.coffee

@@ -35,10 +35,6 @@ describe 'Config', ->
 		promise = @conf.getMany([ 'applicationId', 'apiEndpoint' ])
 		expect(promise).to.eventually.deep.equal({ applicationId: 78373, apiEndpoint: 'https://api.resin.io' })
 
-	it 'provides the correct pubnub config', ->
-		promise = @conf.get('pubnub')
-		expect(promise).to.eventually.deep.equal({ subscribe_key: 'foo', publish_key: 'bar', ssl: true })
-
 	it 'generates a uuid and stores it in config.json', ->
 		promise = @conf.get('uuid')
 		promise2 = fs.readFileAsync('./test/data/config.json').then(JSON.parse).get('uuid')
@@ -122,15 +118,6 @@ describe 'Config', ->
 			@conf = new Config({ @db })
 			@initialization = @db.init().then =>
 				@conf.init()
-		it 'should allow setting of mutable function config options', ->
-			@conf.set({ logsChannelSecret: 'test' })
-			.then =>
-				expect(@conf.get('logsChannelSecret')).to.eventually.equal('test')
-
-		it 'should allow removing of mutabe function config options', ->
-			@conf.remove('logsChannelSecret')
-			.then =>
-				expect(@conf.get('logsChannelSecret')).to.eventually.be.undefined
 
 		it 'should throw if a non-mutable function provider is set', ->
 			expect(@conf.set({ version: 'some-version' })).to.be.rejected

test/05-device-state.spec.coffee

@@ -42,7 +42,6 @@ testTarget1 = {
 			'RESIN_SUPERVISOR_DELTA_VERSION': '2'
 			'RESIN_SUPERVISOR_LOCAL_MODE': 'false'
 			'RESIN_SUPERVISOR_LOG_CONTROL': 'true'
-			'RESIN_SUPERVISOR_NATIVE_LOGGER': 'true'
 			'RESIN_SUPERVISOR_OVERRIDE_LOCK': 'false'
 			'RESIN_SUPERVISOR_POLL_INTERVAL': '60000'
 			'RESIN_SUPERVISOR_VPN_CONTROL': 'true'
@@ -125,7 +124,6 @@ testTargetWithDefaults2 = {
 			'RESIN_SUPERVISOR_DELTA_VERSION': '2'
 			'RESIN_SUPERVISOR_LOCAL_MODE': 'false'
 			'RESIN_SUPERVISOR_LOG_CONTROL': 'true'
-			'RESIN_SUPERVISOR_NATIVE_LOGGER': 'true'
 			'RESIN_SUPERVISOR_OVERRIDE_LOCK': 'false'
 			'RESIN_SUPERVISOR_POLL_INTERVAL': '60000'
 			'RESIN_SUPERVISOR_VPN_CONTROL': 'true'

test/data/testconfig-apibinder-offline.json

@@ -1 +1 @@
-{"applicationName":"supertestrpi3","applicationId":78373,"deviceType":"raspberrypi3","userId":1001,"username":"someone","appUpdatePollInterval":3000,"listenPort":2345,"vpnPort":443,"apiEndpoint":"http://0.0.0.0:3000","vpnEndpoint":"vpn.resin.io","registryEndpoint":"registry2.resin.io","deltaEndpoint":"https://delta.resin.io","pubnubSubscribeKey":"foo","pubnubPublishKey":"bar","mixpanelToken":"baz","apiKey":"boo","version":"2.0.6+rev3.prod","supervisorOfflineMode":true}
+{"applicationName":"supertestrpi3","applicationId":78373,"deviceType":"raspberrypi3","userId":1001,"username":"someone","appUpdatePollInterval":3000,"listenPort":2345,"vpnPort":443,"apiEndpoint":"http://0.0.0.0:3000","vpnEndpoint":"vpn.resin.io","registryEndpoint":"registry2.resin.io","deltaEndpoint":"https://delta.resin.io","mixpanelToken":"baz","apiKey":"boo","version":"2.0.6+rev3.prod","supervisorOfflineMode":true}

test/data/testconfig-apibinder.json

@@ -1 +1 @@
-{"applicationName":"supertestrpi3","applicationId":78373,"deviceType":"raspberrypi3","userId":1001,"username":"someone","appUpdatePollInterval":3000,"listenPort":2345,"vpnPort":443,"apiEndpoint":"http://0.0.0.0:3000","vpnEndpoint":"vpn.resin.io","registryEndpoint":"registry2.resin.io","deltaEndpoint":"https://delta.resin.io","pubnubSubscribeKey":"foo","pubnubPublishKey":"bar","mixpanelToken":"baz","apiKey":"boo","version":"2.0.6+rev3.prod"}
+{"applicationName":"supertestrpi3","applicationId":78373,"deviceType":"raspberrypi3","userId":1001,"username":"someone","appUpdatePollInterval":3000,"listenPort":2345,"vpnPort":443,"apiEndpoint":"http://0.0.0.0:3000","vpnEndpoint":"vpn.resin.io","registryEndpoint":"registry2.resin.io","deltaEndpoint":"https://delta.resin.io","mixpanelToken":"baz","apiKey":"boo","version":"2.0.6+rev3.prod"}

test/data/testconfig.json

@@ -1 +1 @@
-{"applicationName":"supertestrpi3","applicationId":78373,"deviceType":"raspberrypi3","userId":1001,"username":"someone","appUpdatePollInterval":3000,"listenPort":2345,"vpnPort":443,"apiEndpoint":"https://api.resin.io","vpnEndpoint":"vpn.resin.io","registryEndpoint":"registry2.resin.io","deltaEndpoint":"https://delta.resin.io","pubnubSubscribeKey":"foo","pubnubPublishKey":"bar","mixpanelToken":"baz","apiKey":"boo","version":"2.0.6+rev3.prod"}
+{"applicationName":"supertestrpi3","applicationId":78373,"deviceType":"raspberrypi3","userId":1001,"username":"someone","appUpdatePollInterval":3000,"listenPort":2345,"vpnPort":443,"apiEndpoint":"https://api.resin.io","vpnEndpoint":"vpn.resin.io","registryEndpoint":"registry2.resin.io","deltaEndpoint":"https://delta.resin.io","mixpanelToken":"baz","apiKey":"boo","version":"2.0.6+rev3.prod"}

tools/dind/start-resin-supervisor

@@ -42,8 +42,6 @@ runSupervisor() {
         -e BOOT_MOUNTPOINT=$BOOT_MOUNTPOINT \
         -e API_ENDPOINT=$API_ENDPOINT \
         -e REGISTRY_ENDPOINT=$REGISTRY_ENDPOINT \
-        -e PUBNUB_SUBSCRIBE_KEY=$PUBNUB_SUBSCRIBE_KEY \
-        -e PUBNUB_PUBLISH_KEY=$PUBNUB_PUBLISH_KEY \
         -e MIXPANEL_TOKEN=$MIXPANEL_TOKEN \
         -e DELTA_ENDPOINT=$DELTA_ENDPOINT \
         -e LED_FILE=${LED_FILE} \
@@ -62,4 +60,4 @@ elif [ "$SUPERVISOR_IMAGE_ID" = "$SUPERVISOR_CONTAINER_IMAGE_ID" ]; then
 else
     # No supervisor container exists or there's a different supervisor image to run
     runSupervisor
-fi
+fi