fix failing tests; install golang-agent from file;

Author: tomzo

CHANGELOG.md

@@ -1,3 +1,10 @@
+# 1.3.1
+
+ * #93 Fix GO_SERVER_URL not being set correctly on windows
+ * #92 fix several issues with installing server on windows
+ * replaced obsolete gpg key
+ * install golang agent as a binary from bintray
+
 # 1.3.0
 
  * rewritten chef resources to use new custom resource syntax

README.md

@@ -39,7 +39,7 @@ The **apt** repository can be overriden by changing any these attributes:
  * `node['gocd']['repository']['apt']['components'] = [ '/' ]`
  * `node['gocd']['repository']['apt']['distribution'] = ''`
  * `node['gocd']['repository']['apt']['keyserver'] = 'pgp.mit.edu'`
- * `node['gocd']['repository']['apt']['key'] = '0xd8843f288816c449'`
+ * `node['gocd']['repository']['apt']['key'] = 'https://download.go.cd/GOCD-GPG-KEY.asc'`
 
 The **yum** repository can be overriden by changing any these attributes:
 

attributes/agent.rb

@@ -18,8 +18,4 @@
 default['gocd']['agent']['count']               = 1
 default['gocd']['agent']['default_extras']      = {}
 
-default['gocd']['agent']['golang']['repository']['uri'] = 'https://dl.bintray.com/alex-hal9000/gocd-golang-agent'
-default['gocd']['agent']['golang']['repository']['apt']['components'] = ['main']
-default['gocd']['agent']['golang']['repository']['apt']['distribution'] = 'master'
-default['gocd']['agent']['golang']['repository']['apt']['keyserver'] = 'hkp://keyserver.ubuntu.com:80'
-default['gocd']['agent']['golang']['repository']['apt']['key'] = '379CE192D401AB61'
+default['gocd']['agent']['golang']['version'] = '1.6'

libraries/helpers.rb

@@ -208,6 +208,13 @@ def go_server_package_url
         "#{go_baseurl}/#{remote_version}/#{os_dir}/#{go_server_remote_package_name}"
       end
     end
+
+    def arch
+      node['kernel']['machine'] =~ /x86_64/ ? 'amd64' : node['kernel']['machine']
+    end
+    def os
+      node['os']
+    end
   end
 end
 

metadata.rb

@@ -2,7 +2,7 @@
 description      "Installs/Configures Go servers and agents"
 maintainer       "GoCD Contributors"
 maintainer_email "go-cd@googlegroups.com"
-version          "1.3.0"
+version          "1.3.1"
 
 supports "ubuntu"
 supports "centos"

recipes/agent_linux_install.rb

@@ -44,15 +44,12 @@
   case node['platform_family']
   when 'debian'
     include_recipe 'apt'
-    apt_repository 'gocd-golang-agent' do
-      uri node['gocd']['agent']['golang']['repository']['uri']
-      components node['gocd']['agent']['golang']['repository']['apt']['components']
-      distribution node['gocd']['agent']['golang']['repository']['apt']['distribution']
-      keyserver node['gocd']['agent']['golang']['repository']['apt']['keyserver'] unless node['gocd']['agent']['golang']['repository']['apt']['keyserver'] == false
-      key node['gocd']['agent']['golang']['repository']['apt']['key'] unless node['gocd']['agent']['golang']['repository']['apt']['key'] == false
-    end
-    apt_package 'gocd-golang-agent' do
-      options '--force-yes'
+    agent_version = node['gocd']['agent']['golang']['version']
+    remote_file '/usr/bin/gocd-golang-agent' do
+      source "https://bintray.com/gocd-contrib/gocd_golang_goagent/download_file?file_path=goagent%2F#{agent_version}%2Fgocd-golang-agent_#{os}_#{arch}_#{agent_version}"
+      mode 00755
+      owner 'root'
+      group 'root'
     end
   else
     fail 'golang agent installation is only supported on debian-based systems'

spec/go_agent_lwrp_spec.rb

@@ -55,14 +55,6 @@
     it 'does not install java' do
       expect(chef_run).to_not include_recipe('java')
     end
-    it 'adds golang apt repository' do
-      expect(chef_run).to add_apt_repository 'gocd-golang-agent'
-    end
-    it 'installs gocd-golang-agent package' do
-      expect(chef_run).to install_apt_package('gocd-golang-agent').with(
-        options: '--force-yes'
-      )
-    end
     it 'creates init.d script for my-go-agent' do
       expect(chef_run).to render_file('/etc/init.d/my-go-agent').with_content { |content|
         expect(content).to include('Provides: my-go-agent')
@@ -90,11 +82,17 @@
         node.automatic['platform_family'] = 'debian'
         node.automatic['platform'] = 'debian'
         node.automatic['os'] = 'linux'
+        node.automatic['kernel']['machine'] = 'x86_64'
         node.normal['gocd']['agent']['type'] = 'golang'
       end
       run.converge('gocd_test::default_agent_lwrp')
     end
     it_behaves_like :my_golang_agent
+    it 'downloads linux binary' do
+      expect(chef_run).to create_remote_file('/usr/bin/gocd-golang-agent').with(
+        source: 'https://bintray.com/gocd-contrib/gocd_golang_goagent/download_file?file_path=goagent%2F1.6%2Fgocd-golang-agent_linux_amd64_1.6'
+      )
+    end
     it 'does not create autoregister.sh file' do
       expect(chef_run).to_not create_gocd_agent_autoregister_file('/mnt/big_drive/config/autoregister.sh')
     end

spec/shared_examples.rb

@@ -12,7 +12,7 @@
     expect(chef_run).to add_apt_repository('gocd').with(
       uri: 'https://download.go.cd',
       keyserver: "pgp.mit.edu",
-      key: "0xd8843f288816c449",
+      key: "https://download.go.cd/GOCD-GPG-KEY.asc",
       components: ['/'])
   end
   it 'adds gocd experimental apt repository if experimental flag is turned on' do
@@ -21,7 +21,7 @@
     expect(chef_run).to add_apt_repository('gocd').with(
       uri: 'https://download.go.cd/experimental',
       keyserver: "pgp.mit.edu",
-      key: "0xd8843f288816c449",
+      key: "https://download.go.cd/GOCD-GPG-KEY.asc",
       components: ['/'])
   end
 end

test/integration/golangagent/serverspec/go_agent_daemon_spec.rb

@@ -5,7 +5,7 @@
 
 describe 'golang agent package' do
   it 'should be installed' do
-    expect(package('gocd-golang-agent')).to be_installed
+    expect(file('/usr/bin/gocd-golang-agent')).to exist
   end
   it 'java agent should not be installed' do
     expect(package('go-agent')).to_not be_installed