gds_zendesk 3.5.0 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 295c904eb9989c554f38965497034a3bde4198704a877c5cee12bcbdeb9ebe0f
-  data.tar.gz: 81eed2876f42175f4340ccf711183e56f90855af12ba5082d991121442fabf12
+  metadata.gz: a0f492a71decbbe5f107ebbf6703886786b27b520efb742f6498835ab2193362
+  data.tar.gz: 1494834b7c7074de6ecfa2c7fdcebf9f6e0f18ca2b84bbe165bcb15cf5e1f949
 SHA512:
-  metadata.gz: fe800f77bdccf1620913dc2f9b0b599eb6f733ab73211846ece1db93246eaa700373cc8d266f77728e3a53bcc0297b40e6c1033b1b4a8b718fe6ef0b89bebacb
-  data.tar.gz: c6c3086942dce3330f55e61b96175359d102ef6fab1cf7b8787c328fd95d6646e0fea38c69ac75ea2ef26aa034d866d52cdb9a42ef26c44517568d9c7c5e501e
+  metadata.gz: 1069ab78782765fa979aaa68868fc9d3747a9f178d12c33810274660ac18f38947c430650c9307ba8ed158cbcaa53f6713086ec3b839400c92586aae90c432dc
+  data.tar.gz: 524d13268522c1e910cbcf75cf2c26726b01d2ebbbdf327cdcd02fa4cea2c1b813b47a89705dc8dc7683b2e78127acaf1328155602d05437720e4318105b9e47

data/.github/workflows/ci.yml

@@ -1,6 +1,21 @@
 on: [push, pull_request]
 
 jobs:
+  snyk-security:
+    name: SNYK security analysis
+    uses: alphagov/govuk-infrastructure/.github/workflows/snyk-security.yml@main
+    secrets: inherit
+  
+  codeql-sast:
+    name: CodeQL SAST scan
+    uses: alphagov/govuk-infrastructure/.github/workflows/codeql-analysis.yml@main
+    permissions:
+      security-events: write
+
+  dependency-review:
+    name: Dependency Review scan
+    uses: alphagov/govuk-infrastructure/.github/workflows/dependency-review.yml@main
+  
   test_matrix:
     strategy:
       fail-fast: false

data/.govuk_dependabot_merger.yml

@@ -0,0 +1,6 @@
+api_version: 1
+auto_merge:
+  - dependency: rubocop-govuk
+    allowed_semver_bumps:
+      - patch
+      - minor

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 3.6.0
+
+* Don't require requested user object to respond to `#job` or `#phone` in calls to `Users#create_or_update_user`
+
 # 3.5.0
 
 * Add support for `zendesk_api` v3.x

data/gds_zendesk.gemspec

@@ -23,6 +23,6 @@ Gem::Specification.new do |gem|
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec", "~> 3"
-  gem.add_development_dependency "rubocop-govuk", "4.12.0"
+  gem.add_development_dependency "rubocop-govuk", "4.13.0"
   gem.add_development_dependency "webmock", ">= 2"
 end

data/lib/gds_zendesk/users.rb

@@ -31,18 +31,19 @@ module GDSZendesk
     end
 
     def create(requested_user)
-      @client.users.create!(email: requested_user.email,
-                            name: requested_user.name,
-                            details: "Job title: #{requested_user.job}",
-                            phone: requested_user.phone,
-                            verified: true)
+      attributes = { email: requested_user.email, name: requested_user.name, verified: true }
+      attributes[:details] = "Job title: #{requested_user.job}" if requested_user.respond_to?(:job)
+      attributes[:phone] = requested_user.phone if requested_user.respond_to?(:phone)
+      @client.users.create!(attributes)
     end
 
     def update(existing_user_in_zendesk, requested_user)
-      existing_user_in_zendesk.update(details: "Job title: #{requested_user.job}")
-      if !requested_user.phone.nil? && !requested_user.phone.empty?
-        existing_user_in_zendesk.update(phone: requested_user.phone)
+      attributes = {}
+      attributes[:details] = "Job title: #{requested_user.job}" if requested_user.respond_to?(:job)
+      if requested_user.respond_to?(:phone) && !requested_user.phone.nil? && !requested_user.phone.empty?
+        attributes[:phone] = requested_user.phone
       end
+      existing_user_in_zendesk.update(attributes)
       existing_user_in_zendesk.save
       existing_user_in_zendesk
     end

data/lib/gds_zendesk/version.rb

@@ -1,3 +1,3 @@
 module GDSZendesk
-  VERSION = "3.5.0".freeze
+  VERSION = "3.6.0".freeze
 end

data/spec/gds_zendesk/users_spec.rb

@@ -23,6 +23,20 @@ module GDSZendesk
         expect(stub_post).to have_been_requested
       end
 
+      it "can update a user which doesn't respond to #job" do
+        stub_post = stub_zendesk_user_update(123, phone: "12345")
+        users.create_or_update_user(double("requested user", email: "test@test.com", phone: "12345"))
+
+        expect(stub_post).to have_been_requested
+      end
+
+      it "can update a user which doesn't respond to #phone" do
+        stub_post = stub_zendesk_user_update(123, details: "Job title: Developer")
+        users.create_or_update_user(double("requested user", email: "test@test.com", job: "Developer"))
+
+        expect(stub_post).to have_been_requested
+      end
+
       it "knows whether the user is suspended or not" do
         zendesk_has_user(email: "test@test.com", id: 123, suspended: "true")
         expect(users).to be_suspended("test@test.com")
@@ -30,6 +44,16 @@ module GDSZendesk
     end
 
     context "when a user doesn't exist" do
+      let(:expected_attributes) do
+        {
+          verified: true,
+          name: "Abc",
+          email: "test@test.com",
+          phone: "12345",
+          details: "Job title: Developer",
+        }
+      end
+
       before do
         zendesk_has_no_user_with_email("test@test.com")
       end
@@ -39,15 +63,30 @@ module GDSZendesk
       end
 
       it "can create that user" do
-        stub_post = stub_zendesk_user_creation(
-          verified: true,
-          name: "Abc",
-          email: "test@test.com",
-          phone: "12345",
-          details: "Job title: Developer",
-        )
-        user_being_requested = double("requested user",
-                                      name: "Abc", email: "test@test.com", phone: "12345", job: "Developer")
+        stub_post = stub_zendesk_user_creation(expected_attributes)
+        user_being_requested = double("requested user", {
+          name: "Abc", email: "test@test.com", phone: "12345", job: "Developer"
+        })
+
+        users.create_or_update_user(user_being_requested)
+        expect(stub_post).to have_been_requested
+      end
+
+      it "can create that user which doesn't respond to #job" do
+        stub_post = stub_zendesk_user_creation(expected_attributes.except(:details))
+        user_being_requested = double("requested user", {
+          name: "Abc", email: "test@test.com", phone: "12345"
+        })
+
+        users.create_or_update_user(user_being_requested)
+        expect(stub_post).to have_been_requested
+      end
+
+      it "can create that user which doesn't respond to #phone" do
+        stub_post = stub_zendesk_user_creation(expected_attributes.except(:phone))
+        user_being_requested = double("requested user", {
+          name: "Abc", email: "test@test.com", job: "Developer"
+        })
 
         users.create_or_update_user(user_being_requested)
         expect(stub_post).to have_been_requested

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gds_zendesk
 version: !ruby/object:Gem::Version
-  version: 3.5.0
+  version: 3.6.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-11 00:00:00.000000000 Z
+date: 2024-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: null_logger
@@ -78,14 +78,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.13.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.12.0
+        version: 4.13.0
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,7 @@ files:
 - ".github/dependabot.yml"
 - ".github/workflows/ci.yml"
 - ".gitignore"
+- ".govuk_dependabot_merger.yml"
 - ".rubocop.yml"
 - ".ruby-version"
 - CHANGELOG.md
@@ -147,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.5.4
 signing_key: 
 specification_version: 4
 summary: Client and models for communicating with Zendesk