[Alerting & Actions] Overwrite SOs when updating instead of partially updating

x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.test.ts

@@ -1294,7 +1294,7 @@ describe('#update', () => {
       references: [],
     };
 
-    mockBaseClient.update.mockResolvedValue(mockedResponse);
+    mockBaseClient.create.mockResolvedValue(mockedResponse);
 
     await expect(wrapper.update('known-type', 'some-id', attributes, options)).resolves.toEqual({
       ...mockedResponse,
@@ -1313,17 +1313,17 @@ describe('#update', () => {
       { user: mockAuthenticatedUser() }
     );
 
-    expect(mockBaseClient.update).toHaveBeenCalledTimes(1);
-    expect(mockBaseClient.update).toHaveBeenCalledWith(
+    expect(mockBaseClient.create).toHaveBeenCalledTimes(1);
+    expect(mockBaseClient.create).toHaveBeenCalledWith(
       'known-type',
-      'some-id',
+
       {
         attrOne: 'one',
         attrSecret: '*secret*',
         attrNotSoSecret: '*not-so-secret*',
         attrThree: 'three',
       },
-      options
+      { id: 'some-id', overwrite: true, ...options }
     );
   });
 
@@ -1333,7 +1333,7 @@ describe('#update', () => {
       const options = { version: 'some-version', namespace };
       const mockedResponse = { id: 'some-id', type: 'known-type', attributes, references: [] };
 
-      mockBaseClient.update.mockResolvedValue(mockedResponse);
+      mockBaseClient.create.mockResolvedValue(mockedResponse);
 
       await expect(wrapper.update('known-type', 'some-id', attributes, options)).resolves.toEqual({
         ...mockedResponse,
@@ -1351,12 +1351,12 @@ describe('#update', () => {
         { user: mockAuthenticatedUser() }
       );
 
-      expect(mockBaseClient.update).toHaveBeenCalledTimes(1);
-      expect(mockBaseClient.update).toHaveBeenCalledWith(
+      expect(mockBaseClient.create).toHaveBeenCalledTimes(1);
+      expect(mockBaseClient.create).toHaveBeenCalledWith(
         'known-type',
-        'some-id',
+
         { attrOne: 'one', attrSecret: '*secret*', attrThree: 'three' },
-        options
+        { id: 'some-id', overwrite: true, ...options }
       );
     };
 
@@ -1372,7 +1372,7 @@ describe('#update', () => {
 
   it('fails if base client fails', async () => {
     const failureReason = new Error('Something bad happened...');
-    mockBaseClient.update.mockRejectedValue(failureReason);
+    mockBaseClient.create.mockRejectedValue(failureReason);
 
     await expect(
       wrapper.update('known-type', 'some-id', {
@@ -1382,12 +1382,11 @@ describe('#update', () => {
       })
     ).rejects.toThrowError(failureReason);
 
-    expect(mockBaseClient.update).toHaveBeenCalledTimes(1);
-    expect(mockBaseClient.update).toHaveBeenCalledWith(
+    expect(mockBaseClient.create).toHaveBeenCalledTimes(1);
+    expect(mockBaseClient.create).toHaveBeenCalledWith(
       'known-type',
-      'some-id',
       { attrOne: 'one', attrSecret: '*secret*', attrThree: 'three' },
-      undefined
+      { id: 'some-id', overwrite: true }
     );
   });
 });

x-pack/plugins/encrypted_saved_objects/server/saved_objects/encrypted_saved_objects_client_wrapper.ts

@@ -200,7 +200,7 @@ export class EncryptedSavedObjectsClientWrapper implements SavedObjectsClientCon
   public async update<T>(
     type: string,
     id: string,
-    attributes: Partial<T>,
+    attributes: T,
     options?: SavedObjectsUpdateOptions
   ) {
     if (!this.options.service.isRegistered(type)) {
@@ -212,13 +212,20 @@ export class EncryptedSavedObjectsClientWrapper implements SavedObjectsClientCon
       options?.namespace
     );
     return this.handleEncryptedAttributesInResponse(
-      await this.options.baseClient.update(
+      await this.options.baseClient.create<T>(
         type,
-        id,
-        await this.options.service.encryptAttributes({ type, id, namespace }, attributes, {
-          user: this.options.getCurrentUser(),
-        }),
-        options
+        (await this.options.service.encryptAttributes(
+          { type, id, namespace },
+          attributes as Record<string, unknown>,
+          {
+            user: this.options.getCurrentUser(),
+          }
+        )) as T,
+        {
+          id,
+          overwrite: true,
+          ...options,
+        }
       ),
       attributes,
       namespace

x-pack/test/alerting_api_integration/security_and_spaces/tests/actions/builtin_action_types/webhook.ts

@@ -116,6 +116,77 @@ export default function webhookTest({ getService }: FtrProviderContext) {
       });
     });
 
+    it('should remove headers when a webhook is updated', async () => {
+      const { body: createdAction } = await supertest
+        .post('/api/actions/action')
+        .set('kbn-xsrf', 'test')
+        .send({
+          name: 'A generic Webhook action',
+          actionTypeId: '.webhook',
+          secrets: {
+            user: 'username',
+            password: 'mypassphrase',
+          },
+          config: {
+            url: webhookSimulatorURL,
+            headers: {
+              someHeader: '123',
+            },
+          },
+        })
+        .expect(200);
+
+      expect(createdAction).to.eql({
+        id: createdAction.id,
+        isPreconfigured: false,
+        name: 'A generic Webhook action',
+        actionTypeId: '.webhook',
+        config: {
+          ...defaultValues,
+          url: webhookSimulatorURL,
+          headers: {
+            someHeader: '123',
+          },
+        },
+      });
+
+      await supertest
+        .put(`/api/actions/action/${createdAction.id}`)
+        .set('kbn-xsrf', 'foo')
+        .send({
+          name: 'A generic Webhook action',
+          secrets: {
+            user: 'username',
+            password: 'mypassphrase',
+          },
+          config: {
+            url: webhookSimulatorURL,
+            headers: {
+              someOtherHeader: '456',
+            },
+          },
+        })
+        .expect(200);
+
+      const { body: fetchedAction } = await supertest
+        .get(`/api/actions/action/${createdAction.id}`)
+        .expect(200);
+
+      expect(fetchedAction).to.eql({
+        id: fetchedAction.id,
+        isPreconfigured: false,
+        name: 'A generic Webhook action',
+        actionTypeId: '.webhook',
+        config: {
+          ...defaultValues,
+          url: webhookSimulatorURL,
+          headers: {
+            someOtherHeader: '456',
+          },
+        },
+      });
+    });
+
     it('should send authentication to the webhook target', async () => {
       const webhookActionId = await createWebhookAction(webhookSimulatorURL);
       const { body: result } = await supertest

x-pack/test/encrypted_saved_objects_api_integration/fixtures/api_consumer_plugin/server/index.ts

@@ -62,6 +62,10 @@ export const plugin: PluginInitializer<void, void, PluginsSetup, PluginsStart> =
             publicPropertyExcludedFromAAD: { type: 'keyword' },
             publicPropertyStoredEncrypted: { type: 'binary' },
             privateProperty: { type: 'binary' },
+            publicDeepProperty: {
+              enabled: false,
+              type: 'object',
+            },
           },
         }),
       });
@@ -112,6 +116,31 @@ export const plugin: PluginInitializer<void, void, PluginsSetup, PluginsStart> =
       }
     );
 
+    for (const route of ['saved_objects', 'hidden_saved_objects']) {
+      router.put(
+        {
+          path: `/api/${route}/update-with-partial/{type}/{id}`,
+          validate: { params: (value) => ({ value }), body: (value) => ({ value }) },
+        },
+        async (context, request, response) => {
+          const [{ savedObjects }] = await core.getStartServices();
+          const { type, id } = request.params;
+          const { attributes } = request.body as { attributes: any };
+
+          return response.ok({
+            body: await savedObjects
+              .getScopedClient(request, {
+                includedHiddenTypes: [HIDDEN_SAVED_OBJECT_WITH_SECRET_TYPE],
+                excludedWrappers: ['encryptedSavedObjects'],
+              })
+              .update(type, id, attributes, {
+                refresh: true,
+              }),
+          });
+        }
+      );
+    }
+
     registerHiddenSORoutes(router, core, deps, [HIDDEN_SAVED_OBJECT_WITH_SECRET_TYPE]);
   },
   start() {},